X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=5ae2131430aec758e33a71d8eea873bec0b4938e;hb=6a3077638c3045db3888c8c5641d141ff078c8dc;hp=a33f82b246dd597d10446cc8f9f2137f4a340cc9;hpb=21c2226cf3dcad1daf3fb04818583b559694fa81;p=creaMaracasVisu.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index a33f82b..5ae2131 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -1,8 +1,3 @@
-
-
-
-
-
 #-----------------------------------------------------------------------------
 # CPACK+NSIS PACKAGING
 #-----------------------------------------------------------------------------
@@ -24,19 +19,20 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION})
 
 SET(DATA_DIR ${PROJECT_SOURCE_DIR}/data )
-FILE(GLOB DATA_FILES "${DATA_DIR}/*.*")
+FILE(GLOB DATA_FILES "${DATA_DIR}/*.png")
 FOREACH( iLST  ${DATA_FILES} )
    INSTALL( 
-	 FILES ${iLST}
-	 DESTINATION bin/data
+       FILES ${iLST}
+       DESTINATION bin/data
    )
 ENDFOREACH(iLST)
+
 SET(DATA_DIR ${PROJECT_SOURCE_DIR}/data/Icons )
-FILE(GLOB DATA_FILES "${DATA_DIR}/*.*")
+FILE(GLOB DATA_FILES "${DATA_DIR}/*.xpm")
 FOREACH( iLST  ${DATA_FILES} )
    INSTALL( 
-	 FILES ${iLST}
-	 DESTINATION bin/data/Icons
+       FILES ${iLST}
+       DESTINATION bin/data/Icons
    )
 ENDFOREACH(iLST)
 
@@ -52,10 +48,14 @@ ENDFOREACH(iLST)
 #  ENDIF(WIN32)
 
 #ELSE (BUILD_BBTK_PACKAGE_creaMaracasVisu)
-
-  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaMaracasVisu-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+IF(WIN32)
+	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaMaracasVisu-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ELSE(WIN32)
+	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/creaMaracasVisu-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ENDIF(WIN32)
+  
   IF(WIN32)
-    SET(CMAKE_INSTALL_PREFIX C:/CreaTools/creaMaracasVisu)
+   SET(CMAKE_INSTALL_PREFIX C:/CreaTools/creaMaracasVisu)
   ENDIF(WIN32)
 
 
@@ -102,8 +102,8 @@ OPTION(BBTK_STANDALONE_INSTALLER "Install and add to installer all dlls needed,
 
 IF(BBTK_STANDALONE_INSTALLER)
   STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
-  INSTALL(   FILES ${WINDIR}/system32/msvcp71d.dll  				DESTINATION bin/ )
-  INSTALL(   FILES ${WINDIR}/system32/msvcr71d.dll  				DESTINATION bin/ )
+  INSTALL(   FILES ${WINDIR}/system32/msvcp71d.dll  DESTINATION bin/ )
+  INSTALL(   FILES ${WINDIR}/system32/msvcr71d.dll  DESTINATION bin/ )
 
   IF(USE_VTK)
     SET(VTK_BIN_DIR ${VTK_DIR}/../../bin )
@@ -118,23 +118,23 @@ IF(BBTK_STANDALONE_INSTALLER)
   ENDIF(USE_VTK)
     
   IF(USE_ITK)
-    INSTALL(   FILES ${ITK_DIR}/bin/ITKCommon.dll   	DESTINATION bin/ )
+    INSTALL(   FILES ${ITK_DIR}/bin/ITKCommon.dll   DESTINATION bin/ )
   ENDIF(USE_ITK)
 
   IF(USE_WXWIDGETS)
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll   	DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll	   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_html_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll	   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_core_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_xml_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll	   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_odbc_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll  			DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll        DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll   DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll         DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll      DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_html_vc_custom.dll       DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll         DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_core_vc_custom.dll       DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll        DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll        DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_xml_vc_custom.dll       DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll           DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_odbc_vc_custom.dll      DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll       DESTINATION bin/ )
   ENDIF(USE_WXWIDGETS)
 ENDIF(BBTK_STANDALONE_INSTALLER)