*** empty log message ***

diff --git a/appli/TestWxGimmickDialog/CMakeLists.txt b/appli/TestWxGimmickDialog/CMakeLists.txt
index 379f22d53031c617a41e537d01dc1fc496b52b99..80cb7f4b9812c2d1a18007d9d7ab357f4a315834 100644 (file)
--- a/appli/TestWxGimmickDialog/CMakeLists.txt
+++ b/appli/TestWxGimmickDialog/CMakeLists.txt
@@ -6,5 +6,6 @@ ELSE(WIN32)
   ADD_EXECUTABLE(TestWxGimmickDialog main)
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES(TestWxGimmickDialog creaImageIO)
- 
+TARGET_LINK_LIBRARIES( TestWxGimmickDialog creaImageIO)
+
+INSTALL_TARGETS(/bin/ TestWxGimmickDialog )

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index efc6c0e22e717ee38ffa8151a07183a0befb943a..f3b2af04ce0e9c397f24390c6c6fa1feaad250dc 100644 (file)
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -1,9 +1,6 @@
 
 
 
-IF(WIN32)
-  SET(CMAKE_INSTALL_PREFIX C:/CreaTools/creaImageIO)
-ENDIF(WIN32)
 
 
 #-----------------------------------------------------------------------------
@@ -26,7 +23,31 @@ SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION})
 
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+
+#SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+
+
+#IF (BUILD_BBTK_PACKAGE_creaImageIO)
+#
+#  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\bbtk-${BBTK_VERSION}")
+#  IF(WIN32)
+#    SET(CMAKE_INSTALL_PREFIX C:/CreaTools/bbtk-${BBTK_VERSION})
+#  ENDIF(WIN32)
+
+#ELSE (BUILD_BBTK_PACKAGE_creaImageIO)
+
+  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+  IF(WIN32)
+    SET(CMAKE_INSTALL_PREFIX C:/CreaTools/creaImageIO)
+  ENDIF(WIN32)
+
+
+#ENDIF (BUILD_BBTK_PACKAGE_creaImageIO)
+
+
+
 IF(WIN32 AND NOT UNIX)
   # There is a bug in NSI that does not handle full unix paths properly. Make
   # sure there is at least one set of four (4) backlasshes.
@@ -41,13 +62,24 @@ ELSE(WIN32 AND NOT UNIX)
 #  SET(CPACK_STRIP_FILES "bin/bbi")
   SET(CPACK_SOURCE_STRIP_FILES "")
 ENDIF(WIN32 AND NOT UNIX)
-SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickDialog.exe" "Gimmick!")
+SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickDialog" "Gimmick!")
   
 
 INCLUDE(CPack)
 
 
 # Aditional INSTALL for CPACK mecanism.
+IF (WIN32)
+
+  INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.dll DESTINATION bin ) 
+
+ENDIF (WIN32)
+
+
+
+
+
+
 
 IF(EXWIN32)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7a0ac0785c03d307401e9f2491c2cac0d42ae026..f710d3dc4919aa81f0b3a1e612588cbad17f9adb 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -67,10 +67,16 @@ FILE(GLOB HEADERS "*.h")
 INSTALL(
   FILES ${HEADERS}
   DESTINATION include/creaImageIO
-  )  
+  )
+IF (WIN32)
+  SET(CREAIMAGEIO_LIB_PATH bin)
+ELSE (WIN32)
+  SET(CREAIMAGEIO_LIB_PATH lib)
+ENDIF(WIN32)
+
 INSTALL(
   TARGETS creaImageIO 
-  DESTINATION lib)
+  DESTINATION ${CREAIMAGEIO_LIB_PATH})
 
 CREA_INSTALL_LIBRARY_FOR_CMAKE(creaImageIO)
 #-----------------------------------------------------------------------------

diff --git a/src/creaImageIOWxGimmick.cpp b/src/creaImageIOWxGimmick.cpp
index 57cf94f1f0ac707a8e0a3cce968615840b61a472..e58ec0eab4769cd38068359bb12783b8c245d197 100644 (file)
--- a/src/creaImageIOWxGimmick.cpp
+++ b/src/creaImageIOWxGimmick.cpp
@@ -381,7 +381,7 @@ namespace creaImageIO
     rpanel->Layout(); 
   
     // previewer
-    mInteractor = new wxVTKRenderWindowInteractor(mPanelImage,-1);
+       mInteractor = new crea::creawxVTKRenderWindowInteractor(mPanelImage,-1);
     mInteractor->UseCaptureMouseOn();  
   
     mViewer    = vtkImageViewer2::New();

diff --git a/src/creaImageIOWxGimmick.h b/src/creaImageIOWxGimmick.h
index 13cdaf8e3109fc01749d4877339eaf98f5b0ef7f..cd0b919df357426a8e83276268d018096f4e340d 100644 (file)
--- a/src/creaImageIOWxGimmick.h
+++ b/src/creaImageIOWxGimmick.h
@@ -19,7 +19,7 @@
 
 // For image preview 
 // vtk and wxvtk classes
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 #include "vtkImageViewer2.h"
 // multi-thread image reader
 #include <creaImageIOMultiThreadImageReader.h>
@@ -153,7 +153,7 @@ namespace creaImageIO
    // Previewer
     vtkImageViewer2* mViewer;
     // Associated wxvtk interactor
-    crea::wxVTKRenderWindowInteractor  *mInteractor;
+       crea::creawxVTKRenderWindowInteractor  *mInteractor;
   
     int mx1,mx2,my1,my2,mz1,mz2;
     double mspx,mspy,mspz;