X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=cmake%2FCREAMacro_InstallLibraryForCMake.cmake;fp=cmake%2FCREAMacro_InstallLibraryForCMake.cmake;h=2bd7e0db3c76fcb721b492fa538b1c71ff417806;hb=c2bae5bdcb32b42a68b4dd43e3c705a9ff84677e;hp=b88ef701194c425d9dd2b4f1dd48a2663c54e9da;hpb=ffbaf4177cae0647c558f89daf6783b91373930d;p=crea.git diff --git a/cmake/CREAMacro_InstallLibraryForCMake.cmake b/cmake/CREAMacro_InstallLibraryForCMake.cmake index b88ef70..2bd7e0d 100644 --- a/cmake/CREAMacro_InstallLibraryForCMake.cmake +++ b/cmake/CREAMacro_InstallLibraryForCMake.cmake @@ -260,31 +260,31 @@ ENDMACRO(CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE) #----------------------------------------------------------------------------- -MACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME) +MACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME1) # Sets the settings to default values - SET(${LIBRARY_NAME}_INSTALL_FOLDER ${LIBRARY_NAME}) - SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME}) + SET(${LIBRARY_NAME1}_INSTALL_FOLDER ${LIBRARY_NAME1}) + SET(${LIBRARY_NAME1}_LIBRARIES ${LIBRARY_NAME1}) FILE(RELATIVE_PATH - ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS + ${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_INCLUDE_PATHS ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) IF(UNIX) - SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS + SET(${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${EXECUTABLE_OUTPUT_REL_PATH}) - SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib) + SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib) ELSE(UNIX) - SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS + SET(${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${EXECUTABLE_OUTPUT_REL_PATH}/Debug ${EXECUTABLE_OUTPUT_REL_PATH}/Release) - SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin) + SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin) ENDIF(UNIX) - SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME}) + SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME1}) # Invoke the advanced macro - CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME}) + CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME1}) ENDMACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE)