Feature #1711 CreaDevManager application implementation

Merge remote-tracking branch 'refs/remotes/origin/creaDevManager'

Conflicts:
	appli/creaNewProject/NewProject/CMakeLists.txt.in (solved)
	lib/creaDevManagerLib/CDMUtilities.cpp (solved)
	lib/creaDevManagerLib/CDMUtilities.h (solved)
	lib/creaDevManagerLib/modelCDMMain.cpp (solved)
	lib/creaDevManagerLib/wxCDMMainFrame.cpp (solved)

diff --git a/Version.cmake b/Version.cmake
index 34698ae9ffdfbcdadfb619ff338b673163041eed..abc8e56fe960fb7be5c3b2ad5850ed0ede695eb8 100644 (file)
--- a/Version.cmake
+++ b/Version.cmake
@@ -24,5 +24,5 @@
 # ------------------------------------------------------------------------ */  
 
 SET(crea_MAJOR_VERSION 1)
-SET(crea_MINOR_VERSION 0)
+SET(crea_MINOR_VERSION 1)
 SET(crea_BUILD_VERSION 0)

diff --git a/appli/CMakeLists.txt b/appli/CMakeLists.txt
index ffe8db3dafcd7491c41e3ca4b0ac70a388ef049a..70bee0962cfed1e84866907b80b11cd46154475c 100644 (file)
--- a/appli/CMakeLists.txt
+++ b/appli/CMakeLists.txt
@@ -25,7 +25,7 @@
 
 IF(CREA_BUILD_WX)
   ADD_SUBDIRECTORY(creaNewProject)
-  ADD_SUBDIRECTORY(creaDevManager)
+#  ADD_SUBDIRECTORY(creaDevManager)
 ENDIF(CREA_BUILD_WX)
 
 IF(WIN32)

diff --git a/appli/creaDevManager/CMakeLists.txt b/appli/creaDevManager/CMakeLists.txt
index 2caa03c4d2db4356f3148d9e6897824ef1dcbb2c..8eca8df1d75fd320be4be6b5e71e2edf81889ebd 100644 (file)
--- a/appli/creaDevManager/CMakeLists.txt
+++ b/appli/creaDevManager/CMakeLists.txt
@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------
 #
 # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Sant�)
+#                        pour la Santé)
 # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
 # Previous Authors : Laurent Guigues, Jean-Pierre Roux
 # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index ff0a41be67d0fd5cba5d1e1ffc6df1f10d27d808..6d9e41603c95a126392434c67bbc431b6da53944 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -309,18 +309,21 @@ ENDIF(USE_TTH)
 #-----------------------------------------------------------------------------
 IF(USE_BOOST)
   IF(NOT Boost_FOUND)
-      FIND_PACKAGE(Boost COMPONENTS filesystem system signals date_time regex REQUIRED)
+       add_definitions( -DBOOST_ALL_NO_LIB )
+       add_definitions( -DBOOST_ALL_DYN_LINK )
+    FIND_PACKAGE(Boost COMPONENTS filesystem system signals date_time regex REQUIRED)
     IF(Boost_FOUND)
       MESSAGE ( STATUS "=======================================")
       MESSAGE ( STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIR}")
       INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})        
-                       LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS})
+         LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS})
          IF(WIN32)
                CREA_DEFINE( USE_BOOST )
                ADD_DEFINITIONS(-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
                SET(BOOST_LIBRARIES
                        ${Boost_LIBRARIES}
                        )
+                       
 # FCY with cmake boost, it's useless. 
 # But if it is not working, uncomment  
 #

diff --git a/cmake/FindWxWidgetsWin32.cmake b/cmake/FindWxWidgetsWin32.cmake
index fadac59e59083417e881c31ea729706623101196..e7541fb5796610efd4ad28687b9a113ab36d4c60 100644 (file)
--- a/cmake/FindWxWidgetsWin32.cmake
+++ b/cmake/FindWxWidgetsWin32.cmake
@@ -127,12 +127,29 @@ SET(WXWIDGETS_CONFIG_PATH ${WXWIDGETS_ROOT_DIR})
 #
 IF( WIN32_STYLE_FIND )
 
+# EED 31 jan 2013
+#              IF( WXWIDGETS_USE_SHARED )
+#        SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_dll" )
+#              ELSE( WXWIDGETS_USE_SHARED )
+#        SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_lib" )
+#              ENDIF( WXWIDGETS_USE_SHARED )
+
+  IF (CMAKE_CL_64)  ## EED 31 jan 2012
+               IF( WXWIDGETS_USE_SHARED )
+        SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_amd64_dll" )
+               ELSE( WXWIDGETS_USE_SHARED )
+        SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_amd_lib" )
+               ENDIF( WXWIDGETS_USE_SHARED )
+       ELSE(CMAKE_CL_64)
                IF( WXWIDGETS_USE_SHARED )
         SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_dll" )
                ELSE( WXWIDGETS_USE_SHARED )
         SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_lib" )
                ENDIF( WXWIDGETS_USE_SHARED )
+       ENDIF(CMAKE_CL_64)
+       
     SET( WXWIDGETS_LINK_DIRECTORIES ${WXWIDGETS_LIB_PATH} )
+       
 
 ELSE( WIN32_STYLE_FIND )
   IF (UNIX_STYLE_FIND)