From: Eduardo Davila Date: Mon, 18 Oct 2010 13:36:51 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: Creatools2-0-3.creaImageIO0-2-5.17Feb2011~24 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2bf7ecfe007d04fd159053e54c201a330df1db5f;p=creaImageIO.git *** empty log message *** --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0f76b43..2b584cc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -195,11 +195,7 @@ INSTALL( ) -IF (WIN32) - SET(CREAIMAGEIO_LIB_PATH bin) -ELSE (WIN32) - SET(CREAIMAGEIO_LIB_PATH lib) -ENDIF(WIN32) +SET(CREAIMAGEIO_LIB_PATH ${CMAKE_CREA_LIB_PATH} ) INSTALL( TARGETS ${LIBRARY_NAME} @@ -227,14 +223,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) 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})