From e9e64c26a3b262ff13fb651d8e1e0539b3246d25 Mon Sep 17 00:00:00 2001 From: hrocho Date: Wed, 24 Jan 2018 14:21:28 +0100 Subject: [PATCH] cmakelist --- CMakeLists.txt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ffe505..ea3fec0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ endif() ############# Requirements ################## find_package(GSL REQUIRED) - +MESSAGE(STATUS "GSL include dirs: " ${GSL_INCLUDE_DIRS}) #if(THREADS) # find_package(Threads REQUIRED) # set (EXTRA_LIBS ${EXTRA_LIBS} ${CMAKE_THREAD_LIBS_INIT}) @@ -64,10 +64,22 @@ file(GLOB GLOBAL_SOURCES global/*.c) LIST (APPEND SOURCES ${GLOBAL_SOURCES}) endif(GLOBAL) file(GLOB HEADERS *.h) + add_library(catima SHARED ${SOURCES}) add_library(catima_static STATIC ${SOURCES}) set_target_properties(catima_static PROPERTIES OUTPUT_NAME catima POSITION_INDEPENDENT_CODE ON) target_link_libraries(catima ${EXTRA_LIBS} ${GSL_LIBRARIES} ) +target_link_libraries(catima_static ${EXTRA_LIBS} ${GSL_LIBRARIES}) + +target_include_directories(catima + PUBLIC $ + $ + ) +target_include_directories(catima_static + PUBLIC $ + $ + ) + FILE(COPY ${HEADERS} DESTINATION ${PROJECT_BINARY_DIR}/include/catima) # the compiler used for C++ files @@ -108,8 +120,6 @@ if(CATIMA_PYTHON) endif(CATIMA_PYTHON ) ########## Sub Directories ########### -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -include_directories("${PROJECT_BINARY_DIR}/include") if(EXAMPLES) file(GLOB EXAMPLES examples/*.cpp) FILE(COPY ${EXAMPLES} DESTINATION ${PROJECT_BINARY_DIR}/examples) @@ -147,7 +157,6 @@ install (TARGETS catima catima_static ARCHIVE DESTINATION lib) install (FILES ${headers} DESTINATION include/catima) - ###### packaging ####### set(CPACK_PACKAGE_NAME "catima") set(CPACK_PACKAGE_VENDOR "A. Prochazka")