X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=cfe309da1b6eb03a6ff015f9c06c58f8039ab28b;hb=0005327e5412fb30342ba92456b06be932a11dcc;hp=e630799b990fcb3d3824ada5b4b337b911d384ee;hpb=6e3c929c883c405e0075fa8df10b12a935979367;p=creaContours.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index e630799..cfe309d 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -24,25 +24,51 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION})
 
 
+IF (WIN32)
+  SET(INSTALL_DATA_DIR "bin/data")
+ELSE (WIN32)
+  SET(INSTALL_DATA_DIR "share/creaContours/data")
+ENDIF (WIN32)
 
+#-- data --
 SET(DATA_DIR ${PROJECT_SOURCE_DIR}/data )
 FILE(GLOB DATA_FILES "${DATA_DIR}/*.*")
 FOREACH( iLST  ${DATA_FILES} )
    INSTALL( 
 	 FILES ${iLST}
-	 DESTINATION bin/data
+	 DESTINATION ${INSTALL_DATA_DIR}
    )
 ENDFOREACH(iLST)
+
+#-- data/Icons --
 SET(DATA_DIR ${PROJECT_SOURCE_DIR}/data/Icons )
 FILE(GLOB DATA_FILES "${DATA_DIR}/*.*")
 FOREACH( iLST  ${DATA_FILES} )
    INSTALL( 
 	 FILES ${iLST}
-	 DESTINATION bin/data/Icons
+	 DESTINATION ${INSTALL_DATA_DIR}/Icons
    )
 ENDFOREACH(iLST)
 
 
+IF (WIN32)
+  SET(INSTALL_DATA_DIR "bin/share/gimmick")
+ELSE (WIN32)
+  SET(INSTALL_DATA_DIR "share/gimmick/")
+ENDIF (WIN32)
+
+#-- data/gimmick --
+SET(DATA_DIR ${PROJECT_SOURCE_DIR}/data/gimmick )
+FILE(GLOB DATA_FILES "${DATA_DIR}/*.*")
+FOREACH( iLST  ${DATA_FILES} )
+   INSTALL( 
+	 FILES ${iLST}
+	 DESTINATION ${INSTALL_DATA_DIR}
+   )
+ENDFOREACH(iLST)
+
+
+
 #SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaContours-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
 
@@ -55,8 +81,12 @@ ENDFOREACH(iLST)
 #  ENDIF(WIN32)
 
 #ELSE (BUILD_BBTK_PACKAGE_creaContours)
-
-  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaContours-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+IF(WIN32)
+	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaContours-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ELSE(WIN32)
+	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/creaContours-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ENDIF(WIN32)
+  
   IF(WIN32)
     SET(CMAKE_INSTALL_PREFIX C:/CreaTools/creaContours)
   ENDIF(WIN32)