X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FImageMPR%2FCMakeLists.txt;h=3a9ab89bd1331fba9cb86a0fc8cbf0c307753c3b;hb=d6f15d4cb764982e2b09060a9c0f38636891590c;hp=d67386d2acebda4d120f7482f7aedf78feb451f2;hpb=ec99f46f898bfcd579161f1b2c28f8d9b2c8f333;p=cpPlugins.git

diff --git a/appli/ImageMPR/CMakeLists.txt b/appli/ImageMPR/CMakeLists.txt
index d67386d..3a9ab89 100644
--- a/appli/ImageMPR/CMakeLists.txt
+++ b/appli/ImageMPR/CMakeLists.txt
@@ -1,20 +1,26 @@
 IF(USE_QT4)
-  find_package(ITK REQUIRED)
-  include(${ITK_USE_FILE})
-  find_package(VTK REQUIRED)
-  include(${VTK_USE_FILE})
+   SET(App_NAME       "ImageMPR")
 
+ IF(WIN32) 
   CONFIGURE_FILE(
+    Plugins.cfg.in
+    ${PROJECT_BINARY_DIR}/appli/${App_NAME}/Plugins.cfg
+    @ONLY
+    )
+ ELSE(WIN32)
+ CONFIGURE_FILE(
     Plugins.cfg.in
     ${PROJECT_BINARY_DIR}/Plugins.cfg
     @ONLY
     )
+ ENDIF(WIN32)
+	
 
   ## ====================================================
   ## = Source code, user interafaces and resources here =
   ## ====================================================
 
-  SET(App_NAME       "ImageMPR")
+ 
   SET(App_SOURCE_DIR "${PROJECT_SOURCE_DIR}/appli/${App_NAME}")
   SET(App_BINARY_DIR "${PROJECT_BINARY_DIR}/appli/${App_NAME}")
 
@@ -24,7 +30,7 @@ IF(USE_QT4)
     )
   SET(
     App_SOURCES
-    MementoState.cxx
+    #MementoState.cxx
     main.cxx
     )
   SET(
@@ -84,6 +90,10 @@ ENDIF(USE_QT4)
 ## TODO: check rpm and deb configuration for linux
 ##
 
+set(CONFIG_FILE
+  ${PROJECT_BINARY_DIR}/appli/ImageMPR/Plugins.cfg	
+)
+
 set(QT_PACKAGE_LIBRARIES 
    C:/src/qt/qt4.8.6/bin/QtCore4.dll
    C:/src/qt/qt4.8.6/bin/QtCored4.dll
@@ -257,6 +267,7 @@ set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
   ${QT_PACKAGE_LIBRARIES}  
   ${ITK_PACKAGE_LIBRARIES}
   ${VTK_PACKAGE_LIBRARIES}
+  ${CONFIG_FILE}
 )
 
 # Tell CMake to copy CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS content into the package
@@ -264,12 +275,12 @@ include(InstallRequiredSystemLibraries)
     
 
 set(CPACK_PACKAGE_NAME "cpPluginsMprViewer")
-set(CPACK_PACKAGE_VENDOR "Creatis")
+set(CPACK_PACKAGE_VENDOR "Creatis & Pontificia Universidad Javeriana")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "cpPlugins - MPR-Viewer")
-set(CPACK_PACKAGE_VERSION "1.0.0")
-set(CPACK_PACKAGE_VERSION_MAJOR "1")
+set(CPACK_PACKAGE_VERSION "0.0.3")
+set(CPACK_PACKAGE_VERSION_MAJOR "0")
 set(CPACK_PACKAGE_VERSION_MINOR "0")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
+set(CPACK_PACKAGE_VERSION_PATCH "3")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "MPR-Viewer")
 
 install(TARGETS ImageMPR
@@ -277,10 +288,10 @@ install(TARGETS ImageMPR
    DESTINATION bin
    COMPONENT applications)
 
-set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Standard MPR viewer application")
+#set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Standard MPR viewer application")
 
 #set (CPACK_NSIS_MODIFY_PATH "ON")
-SET( CPACK_PACKAGE_EXECUTABLES ImageMPR ImageMPR ) 
+#SET( CPACK_PACKAGE_EXECUTABLES ImageMPR ImageMPR ) 
 SET( CPACK_CREATE_DESKTOP_LINKS ImageMPR ) 
 
 INCLUDE(CPack)
\ No newline at end of file