From 8168861af168bef43abc748a0221b53252cc2c75 Mon Sep 17 00:00:00 2001 From: c9s Date: Thu, 15 May 2014 00:47:52 +0800 Subject: [PATCH] cmake: include_subdirectory(src) and include_subdirectory(tests) --- CMakeLists.txt | 7 +++---- demo.c | 7 +++++++ src/CMakeLists.txt | 9 +++++++++ src/node.c | 1 + 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 demo.c create mode 100644 src/CMakeLists.txt create mode 100644 src/node.c diff --git a/CMakeLists.txt b/CMakeLists.txt index b99640a..72da25d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ) -include_directories(. ${INCLUDE_DIRECTORIES} /opt/local/include) +include_directories(. "${PROJECT_SOURCE_DIR}/include" ${INCLUDE_DIRECTORIES} /opt/local/include) link_directories(${LINK_DIRECTORIES} /opt/local/lib) @@ -45,13 +45,12 @@ set(LIBS ${LIBS} ${PCRE_LIBRARIES} ${Judy_LIBRARIES} r3) enable_testing() # set (CMAKE_CXX_FLAGS "-std=c++0x -arch x86_64 -stdlib=libc++ -g3 -Wall -O0") -# add_subdirectory(src) +add_subdirectory(src) add_subdirectory(tests) add_test(test_tree ${CMAKE_CURRENT_BINARY_DIR}/test_tree) -add_library(r3 main.c) -# add_executable(alphablue-gui main.cc cv.cc) +add_executable(demo demo.c) # target_link_libraries(alphablue-gui ${OpenCV_LIBS} ${GFlags_LIBS} ${GLog_LIBS} ${Boost_LIBS}) # install(TARGETS alphablue-gui DESTINATION bin) diff --git a/demo.c b/demo.c new file mode 100644 index 0000000..3315b96 --- /dev/null +++ b/demo.c @@ -0,0 +1,7 @@ +#include +#include +#include + +int main() { + return 0; +} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..ba5a3bb --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,9 @@ + +include_directories("${PROJECT_SOURCE_DIR}/include") +# install(TARGETS swiftnav-static DESTINATION lib${LIB_SUFFIX}) + +set(libr3_SRCS node.c) +# add_library(r3 STATIC ${libr3_SRCS}) +add_library(r3 SHARED ${libr3_SRCS}) +# target_link_libraries(r3 cblas) +# install(FILES ${libswiftnav_HEADERS} DESTINATION include/libswiftnav) diff --git a/src/node.c b/src/node.c new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/node.c @@ -0,0 +1 @@ +