From: Eduardo Davila Date: Mon, 18 Oct 2010 13:37:56 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: Creatools2-0-3.crea0-3-3.17Feb2011~17 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cbb2fccec2094689f5d99bc9b693a9c7ce4f452c;p=crea.git *** empty log message *** --- diff --git a/cmake/CREAMacro_AddLibrary.cmake b/cmake/CREAMacro_AddLibrary.cmake index f4aea4d..7ae0240 100644 --- a/cmake/CREAMacro_AddLibrary.cmake +++ b/cmake/CREAMacro_AddLibrary.cmake @@ -42,7 +42,7 @@ IF(WIN32) ELSE(WIN32) INSTALL( TARGETS ${LIBRARY_NAME} - DESTINATION lib) + DESTINATION ${CMAKE_CREA_LIB_PATH} ) ENDIF(WIN32) ENDMACRO(CREA_ADD_LIBRARY) diff --git a/cmake/CREAMacro_InstallLibraryForCMake.cmake b/cmake/CREAMacro_InstallLibraryForCMake.cmake index a942cfb..f074d2b 100644 --- a/cmake/CREAMacro_InstallLibraryForCMake.cmake +++ b/cmake/CREAMacro_InstallLibraryForCMake.cmake @@ -184,8 +184,6 @@ MACRO(CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME) ENDIF(${LIBRARY_NAME}_INSTALL_FOLDER) ENDIF(WIN32) - - # UseLIBRARY_NAME.cmake CONFIGURE_FILE( ${CREA_CMAKE_DIR}/InstallLibraryForCMake_UseLibrary.cmake.in @@ -291,7 +289,7 @@ MACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME1) IF(UNIX) SET(${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}) - SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib) + SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${CMAKE_CREA_LIB_PATH} ) ELSE(UNIX) SET(${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${CILFC_EXECUTABLE_OUTPUT_REL_PATH} )