X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FCMakeLists.txt;h=ab04c0f6bdc4c0e9647516106e9380091b00f4a6;hb=4fdb591d3acc9947caa5e26e17ea14e8d78cf061;hp=2faab7b425598f21d365b89f5c0ceeb07125e3f3;hpb=a609787b177c3ba7652e6e4f91cf348f9d7b036c;p=creaContours.git diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 2faab7b..ab04c0f 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -31,14 +31,16 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH}) ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} ) + + SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${CMAKE_CREA_LIB_PATH} ) + IF(UNIX) + ADD_DEFINITIONS(-fPIC) SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}) - SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib) ELSE(UNIX) SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}) - SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin) ENDIF(UNIX) SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME}) @@ -51,9 +53,9 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS # Invoke the advanced macro CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME}) +ADD_SUBDIRECTORY(Interface_ManagerContour_NDimensions) +ADD_SUBDIRECTORY(Interface_Icons_NDimensions) +ADD_SUBDIRECTORY(kernel_ManagerContour_NDimensions) +ADD_SUBDIRECTORY(doxygen) -SUBDIRS(Interface_ManagerContour_NDimensions) -SUBDIRS(Interface_Icons_NDimensions) -SUBDIRS(kernel_ManagerContour_NDimensions) - - \ No newline at end of file +