]> Creatis software - crea.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 18 Oct 2010 13:37:56 +0000 (13:37 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 18 Oct 2010 13:37:56 +0000 (13:37 +0000)
cmake/CREAMacro_AddLibrary.cmake
cmake/CREAMacro_InstallLibraryForCMake.cmake

index f4aea4dcbd1f7528fd78a449aa83f01697d52ab5..7ae0240689dfb342cffdbcf28ac5e6ea4ad6925e 100644 (file)
@@ -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)
index a942cfb7be5943ef5a8829c92b9b79dc9872746b..f074d2b9c61c1515d8fd800d163fa7762bb275a4 100644 (file)
@@ -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} )