From 0e171efc0d15831c2fa2c8a27b35db0212f9f1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 20 Nov 2014 09:53:07 +0100 Subject: [PATCH] CMakeLists cleanup --- CMakeLists.txt | 31 ++++--------------------------- ext/snappy/CMakeLists.txt | 10 ++++++++++ ext/udis86/CMakeLists.txt | 15 +++++++++++++++ 3 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 ext/snappy/CMakeLists.txt create mode 100644 ext/udis86/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index bf2de2e561..bb71c0c6cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,6 +121,8 @@ else() set(CoreLinkType STATIC) endif() +include_directories(native) + if(RPI) include_directories(/opt/vc/include /opt/vc/include/interface/vcos/pthreads) link_directories(/opt/vc/lib) @@ -369,33 +371,8 @@ if(NOT USING_GLES2) set(GLEW_LIBRARIES glew) endif() -add_library(snappy STATIC - ext/snappy/snappy-c.cpp - ext/snappy/snappy-internal.h - ext/snappy/snappy-sinksource.h - ext/snappy/snappy-stubs-internal.h - ext/snappy/snappy-stubs-public.h - ext/snappy/snappy.cpp - ext/snappy/snappy.h -) -include_directories(ext/snappy) - -add_library(udis86 STATIC - ext/udis86/decode.c - ext/udis86/decode.h - ext/udis86/extern.h - ext/udis86/itab.c - ext/udis86/itab.h - ext/udis86/syn-att.c - ext/udis86/syn-intel.c - ext/udis86/syn.c - ext/udis86/syn.h - ext/udis86/types.h - ext/udis86/udint.h - ext/udis86/udis86.c - ext/udis86/udis86.h -) -include_directories(ext/udis86) +add_subdirectory(ext/snappy) +add_subdirectory(ext/udis86) add_library(vjson STATIC native/ext/vjson/json.cpp diff --git a/ext/snappy/CMakeLists.txt b/ext/snappy/CMakeLists.txt new file mode 100644 index 0000000000..f2a9573977 --- /dev/null +++ b/ext/snappy/CMakeLists.txt @@ -0,0 +1,10 @@ +add_library(snappy STATIC + snappy-c.cpp + snappy-internal.h + snappy-sinksource.h + snappy-stubs-internal.h + snappy-stubs-public.h + snappy.cpp + snappy.h +) + diff --git a/ext/udis86/CMakeLists.txt b/ext/udis86/CMakeLists.txt new file mode 100644 index 0000000000..077ea33d83 --- /dev/null +++ b/ext/udis86/CMakeLists.txt @@ -0,0 +1,15 @@ +add_library(udis86 STATIC + decode.c + decode.h + extern.h + itab.c + itab.h + syn-att.c + syn-intel.c + syn.c + syn.h + types.h + udint.h + udis86.c + udis86.h +)