X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FCMakeLists.txt;h=ab04c0f6bdc4c0e9647516106e9380091b00f4a6;hb=refs%2Ftags%2FCreatools2-0-3.creaContour1-2-3.17Feb2011;hp=0040052a2fabb52b9017fd1a81c6661e9bccf25d;hpb=7104ac27b97da4187e863ef28d9d73cf1bf60362;p=creaContours.git diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 0040052..ab04c0f 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -31,15 +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}) @@ -52,9 +53,9 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS # Invoke the advanced macro CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME}) -SUBDIRS(Interface_ManagerContour_NDimensions) -SUBDIRS(Interface_Icons_NDimensions) -SUBDIRS(kernel_ManagerContour_NDimensions) -SUBDIRS(doxygen) +ADD_SUBDIRECTORY(Interface_ManagerContour_NDimensions) +ADD_SUBDIRECTORY(Interface_Icons_NDimensions) +ADD_SUBDIRECTORY(kernel_ManagerContour_NDimensions) +ADD_SUBDIRECTORY(doxygen)