X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=superbuild%2FCMakeLists.txt;h=fad0b95d1b075c243877494b30f06455f14f4e49;hb=0afc0bed742570bfb6d2b3439d06892214b8a764;hp=a3d5dfe7fb0151d82618ea1aa77668244706c9f3;hpb=3cc71f15eada6421e8dc3a6a3d9632946f387e2d;p=clitk.git

diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt
index a3d5dfe..fad0b95 100644
--- a/superbuild/CMakeLists.txt
+++ b/superbuild/CMakeLists.txt
@@ -9,9 +9,9 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Build configuration type"
 set(build_type ${CMAKE_BUILD_TYPE})
 
 #=========================================================
-MACRO (DD in)
-    MESSAGE(${in}=${${in}})
-ENDMACRO(DD)
+macro(DD in)
+    message(${in}=${${in}})
+endmacro(DD)
 #=========================================================
 
 project(SuperBuild_VV)
@@ -38,20 +38,23 @@ set(install_prefix ${base}/Install)
 
 find_package(Git REQUIRED)
 
+if( 1 EQUAL 1)
 #=========================================================
 # QT
-SET(QtWinSpecFiles "${source_prefix}/qt/mkspecs/win32-msvc2003/qmake.conf";
-                   "${source_prefix}/qt/mkspecs/win32-msvc2005/qmake.conf";
-                   "${source_prefix}/qt/mkspecs/win32-msvc2008/qmake.conf";
-                   "${source_prefix}/qt/mkspecs/win32-msvc2010/qmake.conf")
+if(WIN32)
+set(QtWinSpecFiles "${source_prefix}/qt/mkspecs/win32-msvc2003/qmake.conf;${source_prefix}/qt/mkspecs/win32-msvc2005/qmake.conf;${source_prefix}/qt/mkspecs/win32-msvc2008/qmake.conf;${source_prefix}/qt/mkspecs/win32-msvc2010/qmake.conf")
+set(WINPATCH "sed -i \"s/\\-MD/-MT/g\" ${QtWinSpecFiles}")
+else()
+set(WINPATCH "")
+endif()
 ExternalProject_Add(
   QT
   SOURCE_DIR ${source_prefix}/qt
-  GIT_REPOSITORY git://gitorious.org/qt/qt.git
-  GIT_TAG v4.8.3
-  PATCH_COMMAND sed -i "s/\\-MD/-MT/g" ${QtWinSpecFiles}
+  GIT_REPOSITORY git://code.qt.io/qt/qt.git
+  GIT_TAG v4.8.6
+  PATCH_COMMAND ${WINPATCH}
   CONFIGURE_COMMAND ${source_prefix}/qt/configure -confirm-license
-                                                  -static 
+                                                  -static
                                                   -fast
                                                   -opensource
                                                   -release
@@ -65,21 +68,27 @@ ExternalProject_Add(
                                                   -no-glib
   INSTALL_COMMAND ""
 )
-SET(qmake_executable "${build_prefix}/QT/bin/qmake")
+set(qmake_executable "${build_prefix}/QT/bin/qmake")
+set(VTK_DEPEND_QT QT)
+
+else()
+  find_package(qt4 REQUIRED)
+  set(VTK_DEPEND_QT "")
+endif()
 #=========================================================
 
 #=========================================================
 # VTK
-SET(VTK_CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES}")
-IF(MSVC)
-  SET(VTK_CMAKE_CXX_STANDARD_LIBRARIES "${VTK_CMAKE_CXX_STANDARD_LIBRARIES} Imm32.lib Winmm.lib Ws2_32.lib")
-ENDIF(MSVC)
+set(VTK_CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES}")
+if(MSVC)
+  set(VTK_CMAKE_CXX_STANDARD_LIBRARIES "${VTK_CMAKE_CXX_STANDARD_LIBRARIES} Imm32.lib Winmm.lib Ws2_32.lib")
+endif(MSVC)
 ExternalProject_Add(
-  VTK 
-  DEPENDS QT
+  VTK
+  DEPENDS ${VTK_DEPEND_QT}
   SOURCE_DIR ${source_prefix}/vtk
   GIT_REPOSITORY git://vtk.org/VTK.git
-  GIT_TAG v5.10.0
+  GIT_TAG release-5.10
   INSTALL_COMMAND ""
   CMAKE_ARGS
     -DQT_QMAKE_EXECUTABLE:FILEPATH=${qmake_executable}
@@ -100,7 +109,7 @@ ExternalProject_Add(
     -DVTK_USE_QVTK_QTOPENGL:BOOL=ON
     -DCMAKE_CXX_STANDARD_LIBRARIES:STRING=${VTK_CMAKE_CXX_STANDARD_LIBRARIES}
 )
-SET(VTK_DIR ${build_prefix}/VTK)
+set(VTK_DIR ${build_prefix}/VTK)
 #=========================================================
 
 #=========================================================
@@ -108,11 +117,10 @@ SET(VTK_DIR ${build_prefix}/VTK)
    ExternalProject_Add(
    GDCM
    SOURCE_DIR ${source_prefix}/gdcm
-   GIT_REPOSITORY git://git.code.sf.net/p/gdcm/gdcm 
-   GIT_TAG v2.2.3
+   GIT_REPOSITORY git://git.code.sf.net/p/gdcm/gdcm
+   GIT_TAG v2.2.4
    INSTALL_COMMAND ""
    CMAKE_ARGS
-   -DQT_QMAKE_EXECUTABLE:FILEPATH=${qmake_executable}
    -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}
    -DCMAKE_C_FLAGS_MINSIZEREL:STRING=${CMAKE_C_FLAGS_MINSIZEREL}
    -DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}
@@ -124,7 +132,7 @@ SET(VTK_DIR ${build_prefix}/VTK)
    -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
    -DCMAKE_BUILD_TYPE:STRING=${build_type}
 )
-SET(GDCM_DIR ${build_prefix}/GDCM)
+set(GDCM_DIR ${build_prefix}/GDCM)
 #=========================================================
 
 #=========================================================
@@ -133,7 +141,7 @@ ExternalProject_Add(
   ITK
   SOURCE_DIR ${source_prefix}/itk
   GIT_REPOSITORY git://itk.org/ITK.git
-  GIT_TAG v4.4.0
+  GIT_TAG v4.5.2
   INSTALL_COMMAND ""
   CMAKE_ARGS
     -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}
@@ -150,32 +158,33 @@ ExternalProject_Add(
     -DBUILD_EXAMPLES:BOOL=OFF
     -DBUILD_TESTING:BOOL=OFF
 )
-SET(ITK_DIR ${build_prefix}/ITK)
+set(ITK_DIR ${build_prefix}/ITK)
 #=========================================================
 
 #=========================================================
 # VV
-SET(VV_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+set(VV_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 if(MSVC)
-  SET(VV_CMAKE_CXX_FLAGS "${VV_CMAKE_CXX_FLAGS} /bigobj")
+  set(VV_CMAKE_CXX_FLAGS "${VV_CMAKE_CXX_FLAGS} /bigobj")
 endif(MSVC)
 
-SET(VV_CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
+set(VV_CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
 if(CMAKE_COMPILER_IS_GNUCXX)
-  SET(VV_CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+  set(VV_CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
-SET(MAKE_COMMAND "make")
+set(MAKE_COMMAND "make")
 if(MSVC)
-  SET(MAKE_COMMAND "nmake")
+  set(MAKE_COMMAND "nmake")
 endif(MSVC)
 
 ExternalProject_Add(
   VV
-  DEPENDS QT VTK ITK GDCM
+  DEPENDS ${VTK_DEPEND_QT} VTK ITK GDCM
   SOURCE_DIR ${source_prefix}/vv
   GIT_REPOSITORY git://git.creatis.insa-lyon.fr/clitk
-  INSTALL_COMMAND ${MAKE_COMMAND} package
+  INSTALL_DIR ${install_prefix}
+  INSTALL_COMMAND  make install
   CMAKE_ARGS
     -DQT_QMAKE_EXECUTABLE:FILEPATH=${qmake_executable}
     -DGDCM_DIR:PATH=${GDCM_DIR}
@@ -195,10 +204,6 @@ ExternalProject_Add(
     -DCMAKE_BUILD_TYPE:STRING=${build_type}
     -DBUILD_SHARED_LIBS:BOOL=OFF
     -DBUILD_TESTING:BOOL=OFF
-    -DCLITK_BUILD_REGISTRATION:BOOL=ON
-    -DCLITK_BUILD_SEGMENTATION:BOOL=ON
-    -DCLITK_BUILD_TOOLS:BOOL=ON
-    -DCLITK_BUILD_EXPERIMENTAL:BOOL=ON
 )
 #=========================================================