no message

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 3b2b4231fcdf964bed0a69e20ff201f0780ce2d0..ee8c36703b40264df6944f5358c9476edffffdea 100644 (file)
--- 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 72724974490525126c7f3411ee91241b11d24890..c8960dc150000772655218471c05b37c691e3c8c 100644 (file)
--- 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}")