From 46b16f5dac2148fa2d7ef81946a5e703447df88a Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Thu, 23 Oct 2008 10:19:07 +0000 Subject: [PATCH] bug fix --- src/AdditionalUsecreaImageIO.cmake.in | 2 ++ src/AdditionalcreaImageIOConfig.cmake.in | 2 ++ src/CMakeLists.txt | 35 +++++++++++++++++++++++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 src/AdditionalUsecreaImageIO.cmake.in create mode 100644 src/AdditionalcreaImageIOConfig.cmake.in diff --git a/src/AdditionalUsecreaImageIO.cmake.in b/src/AdditionalUsecreaImageIO.cmake.in new file mode 100644 index 0000000..bdf20d7 --- /dev/null +++ b/src/AdditionalUsecreaImageIO.cmake.in @@ -0,0 +1,2 @@ +INCLUDE(${crea_USE_FILE}) + diff --git a/src/AdditionalcreaImageIOConfig.cmake.in b/src/AdditionalcreaImageIOConfig.cmake.in new file mode 100644 index 0000000..35ae10d --- /dev/null +++ b/src/AdditionalcreaImageIOConfig.cmake.in @@ -0,0 +1,2 @@ +# We have to find crea +FIND_PACKAGE(crea REQUIRED) \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f710d3d..ef0d34a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -78,5 +78,38 @@ INSTALL( TARGETS creaImageIO DESTINATION ${CREAIMAGEIO_LIB_PATH}) -CREA_INSTALL_LIBRARY_FOR_CMAKE(creaImageIO) + + # Sets the settings for macro CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE + SET(LIBRARY_NAME creaImageIO) + SET(${LIBRARY_NAME}_INSTALL_FOLDER ${LIBRARY_NAME}) + SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME}) + + FILE(RELATIVE_PATH + ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS + ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} + ) + + IF(UNIX) + SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS + ${EXECUTABLE_OUTPUT_REL_PATH}) + SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib) + ELSE(UNIX) + SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS + ${EXECUTABLE_OUTPUT_REL_PATH}/Debug + ${EXECUTABLE_OUTPUT_REL_PATH}/Release) + SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin) + ENDIF(UNIX) + SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME}) + + SET(${LIBRARY_NAME}_HAS_ADDITIONAL_CONFIG_FILE TRUE) +SET(${LIBRARY_NAME}_ADDITIONAL_CONFIG_FILE + ${PROJECT_SOURCE_DIR}/src/AdditionalcreaImageIOConfig.cmake.in) +SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE + ${PROJECT_SOURCE_DIR}/src/AdditionalUsecreaImageIO.cmake.in) + + # Invoke the advanced macro + CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME}) + + +#CREA_INSTALL_LIBRARY_FOR_CMAKE(creaImageIO) #----------------------------------------------------------------------------- -- 2.45.0