X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=f034cff3032ca41d43402c8270c71a375dcb944b;hb=505d6fd964a8813101ebcf1829b2d55968142f2c;hp=ccf825c787c98bd043bf48ac98ac0a008f9add98;hpb=be766a1931edb662e822a835a0e127c942d1a61e;p=clitk.git

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index ccf825c..f034cff 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -140,7 +140,21 @@ QT4_WRAP_UI(vv_UI_CXX
 
 QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc)
 
-ADD_DEFINITIONS(-DQT_DLL)
+
+# if Windows and Qt was built as a static lib then don't set QT_DLL flag
+SET(QT_STATIC 0)
+IF (WIN32)
+  IF(EXISTS ${QT_LIBRARY_DIR}/QtCore.prl)
+    FILE(READ ${QT_LIBRARY_DIR}/QtCore.prl QT_CORE_PRL)
+    IF(${QT_CORE_PRL} MATCHES "static")
+      SET(QT_STATIC 1)
+    ENDIF(${QT_CORE_PRL} MATCHES "static")
+  ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtCore.prl)
+ENDIF(WIN32)
+IF(NOT QT_STATIC)
+  ADD_DEFINITIONS(-DQT_DLL)
+ENDIF(NOT QT_STATIC)
+
 ADD_DEFINITIONS(-DQT_THREAD_SUPPORT)
 
 INCLUDE_DIRECTORIES(
@@ -157,7 +171,7 @@ INCLUDE_DIRECTORIES(
 #support for parallel deformable registration with OpenMP
 IF(NOT __APPLE__)
 IF(CMAKE_COMPILER_IS_GNUCC)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp -march=native")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 ENDIF(NOT __APPLE__)
 #=========================================================
@@ -172,17 +186,10 @@ IF(WIN32)
   SET(EXE_ICON vvIcon.rc)
 ENDIF(WIN32)
 
-IF(UNIX)
-  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-ENDIF(UNIX)
-
 LINK_DIRECTORIES(${QT_INCLUDES})
 ADD_EXECUTABLE(vv ${vv_SRCS} vv.cxx ${vv_UI_CXX} ${EXE_ICON})
 TARGET_LINK_LIBRARIES(vv clitkCommon clitkDicomRTStruct clitkFilters ${ITK_LIBRARIES} QVTK vtkHybrid)
 
-IF (CLITK_VV_USE_BDCM)
-  TARGET_LINK_LIBRARIES(vv bdcm)
-ENDIF (CLITK_VV_USE_BDCM)
 #=========================================================
 
 #=========================================================
@@ -200,12 +207,11 @@ IF(UNIX AND NOT APPLE)
 ENDIF(UNIX AND NOT APPLE)
 
 IF(WIN32)
-  INCLUDE(InstallRequiredSystemLibraries)
-  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION bin)
-  INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/vv.exe DESTINATION bin)
-  INSTALL(FILES ${QT_PLUGINS_DIR}/../bin/QtCore4.dll DESTINATION bin)
-  INSTALL(FILES ${QT_PLUGINS_DIR}/../bin/QtGui4.dll DESTINATION bin)
+  #INCLUDE(InstallRequiredSystemLibraries)
+  INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/vv.exe DESTINATION .)
+  #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .)
 ENDIF(WIN32)
+#=========================================================
 
 #=========================================================
 # CPack options
@@ -217,20 +223,25 @@ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/License.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv")
 
 IF(WIN32)
-  SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/ducky.png")
-  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/${CMAKE_BUILD_TYPE}/vv.exe")
-  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} The 4D slicer")
+  # 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.
+  SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\icons\\\\ducky.ico")
+  SET(CPACK_NSIS_INSTALLED_ICON_NAME "${CMAKE_BUILD_TYPE}\\\\vv.exe")
+  SET(CPACK_NSIS_DISPLAY_NAME "vv - The 4D slicer")
   SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/rio/vv")
   SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/rio")
-  SET(CPACK_NSIS_MODIFY_PATH ON)
+  SET(CPACK_NSIS_CONTACT "vv@creatis.insa-lyon.fr")
+  SET(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\vv.lnk\\\" \\\"$INSTDIR\\\\vv.exe\\\" ")
+  SET(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\vv.lnk\\\" ")
+  #SET(CPACK_NSIS_MODIFY_PATH ON) SR: buggy, wait for cmake updates for a fix
+  #SET(CPACK_BINARY_ZIP ON)
 ELSE(WIN32)
-  SET(CPACK_STRIP_FILES "bin/vv")
   SET(CPACK_GENERATOR "STGZ")
   SET(CPACK_SOURCE_GENERATOR "TGZ") 
 ENDIF(WIN32)
-SET(CPACK_PACKAGE_EXECUTABLES "vv" "vv")
 INCLUDE(CPack)
-
+#=========================================================