]> Creatis software - creaContours.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 18 Oct 2010 13:37:29 +0000 (13:37 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 18 Oct 2010 13:37:29 +0000 (13:37 +0000)
lib/CMakeLists.txt
lib/Interface_Icons_NDimensions/CMakeLists.txt
lib/Interface_ManagerContour_NDimensions/CMakeLists.txt
lib/kernel_ManagerContour_NDimensions/CMakeLists.txt

index 0040052a2fabb52b9017fd1a81c6661e9bccf25d..b5aeadb3dece19bdfbe40c1c730ef166c5a75da8 100644 (file)
@@ -31,15 +31,16 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
       ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH})
   ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
 
+
+  SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${CMAKE_CREA_LIB_PATH} )
+
   IF(UNIX)
     ADD_DEFINITIONS(-fPIC)
     SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
       ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
-    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
   ELSE(UNIX)
     SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
       ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
-    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
   ENDIF(UNIX)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME})
   
index d8b9adfdea7600c916a5d4aeb6f763a4e64675c8..778164a2cc0359a15e0a0914ce2c811b83d4a058 100644 (file)
@@ -65,18 +65,12 @@ IF ( BUILD_${LIBRARY_NAME} )
   INSTALL(
     FILES ${${LIBRARY_NAME}_HEADERS}
     DESTINATION ${${LIBRARY_NAME_BASE}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS}
-    ) 
-  IF(WIN32)    
-    INSTALL(
-      TARGETS ${LIBRARY_NAME}
-      DESTINATION bin)
-  ELSE(WIN32)
-    INSTALL(
+  ) 
+
+  INSTALL(
       TARGETS ${LIBRARY_NAME}
-      DESTINATION lib)
-  ENDIF(WIN32)
-  
-  
-  
+      DESTINATION ${CMAKE_CREA_LIB_PATH}
+  )
+    
   #---------------------------------------------------------------------------
 ENDIF ( BUILD_${LIBRARY_NAME} )
index 6ace19852eb662337db57df4bb2dea20515b5ffc..46e0c125be2b95238b1493333315d027cc0bab20 100644 (file)
@@ -68,16 +68,11 @@ IF ( BUILD_${LIBRARY_NAME} )
     FILES ${${LIBRARY_NAME}_HEADERS}
     DESTINATION ${${LIBRARY_NAME_BASE}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS}
     ) 
-  IF(WIN32)    
-    INSTALL(
-      TARGETS ${LIBRARY_NAME}
-      DESTINATION bin)
-  ELSE(WIN32)
-    INSTALL(
+
+  INSTALL(
       TARGETS ${LIBRARY_NAME}
-      DESTINATION lib)
-  ENDIF(WIN32)
-  
+      DESTINATION ${CMAKE_CREA_LIB_PATH} 
+  )
  
   
   #---------------------------------------------------------------------------
index 0ed086642a184ab549a963e8e74be0be015123dd..82fc89c9e8199f575b426ad1efbd24ffc2196bdb 100644 (file)
@@ -80,16 +80,11 @@ IF ( BUILD_${LIBRARY_NAME} )
     FILES ${${LIBRARY_NAME}_HEADERS}
     DESTINATION ${${LIBRARY_NAME_BASE}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS}
     ) 
-  IF(WIN32)    
-    INSTALL(
-      TARGETS ${LIBRARY_NAME}
-      DESTINATION bin)
-  ELSE(WIN32)
-    INSTALL(
-      TARGETS ${LIBRARY_NAME}
-      DESTINATION lib)
-  ENDIF(WIN32)
-  
+
+  INSTALL(
+    TARGETS ${LIBRARY_NAME}
+    DESTINATION ${CMAKE_CREA_LIB_PATH} 
+  )
 
   
   #---------------------------------------------------------------------------