X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=kernel%2Fsrc%2FCMakeLists.txt;h=2543518e70e7e0749ff3bba2b75510d4a7b3bcf0;hb=4234999264604da013c2574feef3816c75b3034e;hp=078fffd77e4ef4926da835ae08201d9b0b2ed874;hpb=6d91f7afe800c870a482570e5b0243fc3f425777;p=bbtk.git

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 078fffd..2543518 100644
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -100,7 +100,7 @@ IF(BBTK_USE_BOOST)
   SET(BBTK_LINK_LIBRARIES
     ${BBTK_LINK_LIBRARIES}
     ${BBTK_BOOST_LIBRARIES} 
-    )  
+    ) 
 ENDIF(BBTK_USE_BOOST)
 #-----------------------------------------------------------------------------
 
@@ -177,6 +177,9 @@ ADD_LIBRARY(bbtk SHARED ${SOURCES} ${SOURCES_H})
 #-----------------------------------------------------------------------------
 TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES})
 #-----------------------------------------------------------------------------
+IF(UNIX)
+SET_TARGET_PROPERTIES(bbtk PROPERTIES COMPILE_FLAGS -Wall)
+ENDIF(UNIX)
 
 #IF(UNIX)
 # for gnu linker : version script used to define exported symbols
@@ -205,10 +208,7 @@ TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES})
 #-----------------------------------------------------------------------------
 FILE(GLOB BBTK_HEADERS "*.h")
 INSTALL(FILES ${BBTK_HEADERS} DESTINATION include/bbtk)
-INSTALL(TARGETS bbtk DESTINATION lib)
-IF(WIN32)
-  INSTALL(TARGETS bbtk DESTINATION bin/)
-ENDIF(WIN32)
+INSTALL(TARGETS bbtk DESTINATION ${BBTK_LIB_PATH})
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -223,6 +223,12 @@ SET(LIBRARY_NAME BBTK)
 SET(${LIBRARY_NAME}_INSTALL_FOLDER bbtk)
 SET(${LIBRARY_NAME}_LIBRARIES bbtk)
 SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS kernel/src kernel/src/ThirdParty)
+IF(BBTK_USE_SHIPPED_BOOST)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
+    ${${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS} 
+    kernel/src/ThirdParty/${BBTK_SHIPPED_BOOST}
+    )
+ENDIF(BBTK_USE_SHIPPED_BOOST)
 IF(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
     ${EXECUTABLE_OUTPUT_REL_PATH})
@@ -232,7 +238,7 @@ ELSE(UNIX)
     ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
 ENDIF(UNIX)
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/bbtk include/bbtk/ThirdParty)
-SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${BBTK_LIB_PATH})
 
 # OPTIONAL 
 # - Set the version of your library