From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Thu, 11 Mar 2010 08:06:04 +0000 (+0000)
Subject: no message
X-Git-Tag: CREATOOLS.2-0-3~25
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaContours.git;a=commitdiff_plain;h=7fd47885c64e49b504a9f2448a089a53f05b2eea

no message
---

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 3b2b423..ee8c367 100644
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -120,7 +120,7 @@ bool wxTheApplication :: OnInit()
 	int threads = 1;
 
 	std::vector<vtkImageData*> images;
-
+	printf("EED wxContourGUIExample:OnInit 1\n");
 	creaImageIO::WxGimmickReaderDialog w(0,
 										-1,
 										"creaContours_Descriptor.dscp",
@@ -133,6 +133,7 @@ bool wxTheApplication :: OnInit()
 										threads);
   
 	w.ShowModal();
+	printf("EED wxContourGUIExample:OnInit 2\n");
 
 
 //JCP
diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 7272497..c8960dc 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -24,25 +24,49 @@ 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}")