From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Mon, 18 Oct 2010 13:37:29 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: Creatools2-0-3.creaContour1-2-3.17Feb2011~9
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=498505024562b776b91e25ca30f6e9c6bbd1f963;p=creaContours.git

*** empty log message ***
---

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 0040052..b5aeadb 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -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})
   
diff --git a/lib/Interface_Icons_NDimensions/CMakeLists.txt b/lib/Interface_Icons_NDimensions/CMakeLists.txt
index d8b9adf..778164a 100644
--- a/lib/Interface_Icons_NDimensions/CMakeLists.txt
+++ b/lib/Interface_Icons_NDimensions/CMakeLists.txt
@@ -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} )
diff --git a/lib/Interface_ManagerContour_NDimensions/CMakeLists.txt b/lib/Interface_ManagerContour_NDimensions/CMakeLists.txt
index 6ace198..46e0c12 100644
--- a/lib/Interface_ManagerContour_NDimensions/CMakeLists.txt
+++ b/lib/Interface_ManagerContour_NDimensions/CMakeLists.txt
@@ -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} 
+  )
  
   
   #---------------------------------------------------------------------------
diff --git a/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt b/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt
index 0ed0866..82fc89c 100644
--- a/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt
+++ b/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt
@@ -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} 
+  )
 
   
   #---------------------------------------------------------------------------