]> Creatis software - creaImageIO.git/commitdiff
bug fix
authorJuan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Thu, 23 Oct 2008 10:19:07 +0000 (10:19 +0000)
committerJuan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Thu, 23 Oct 2008 10:19:07 +0000 (10:19 +0000)
src/AdditionalUsecreaImageIO.cmake.in [new file with mode: 0644]
src/AdditionalcreaImageIOConfig.cmake.in [new file with mode: 0644]
src/CMakeLists.txt

diff --git a/src/AdditionalUsecreaImageIO.cmake.in b/src/AdditionalUsecreaImageIO.cmake.in
new file mode 100644 (file)
index 0000000..bdf20d7
--- /dev/null
@@ -0,0 +1,2 @@
+INCLUDE(${crea_USE_FILE})
+
diff --git a/src/AdditionalcreaImageIOConfig.cmake.in b/src/AdditionalcreaImageIOConfig.cmake.in
new file mode 100644 (file)
index 0000000..35ae10d
--- /dev/null
@@ -0,0 +1,2 @@
+# We have to find crea
+FIND_PACKAGE(crea REQUIRED)
\ No newline at end of file
index f710d3dc4919aa81f0b3a1e612588cbad17f9adb..ef0d34a1810150a868bec1b787c473f0554873af 100644 (file)
@@ -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)
 #-----------------------------------------------------------------------------