X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=superbuild%2FCMakeLists.txt;h=df237735199d9f4b85e38aecd2708c94bdd79ea8;hb=004bcd39f231a113951c678008140722b0b28152;hp=f4727a83a1bc0ded2f65e732899fcdb425353498;hpb=066bd4aaccac469831ac6aa535dbf7f7939be78e;p=clitk.git

diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt
index f4727a8..df23773 100644
--- a/superbuild/CMakeLists.txt
+++ b/superbuild/CMakeLists.txt
@@ -62,6 +62,7 @@ ExternalProject_Add(
                                                   -no-libtiff
                                                   -no-libjpeg
                                                   -no-libmng
+                                                  -no-glib
   INSTALL_COMMAND ""
 )
 SET(qmake_executable "${build_prefix}/QT/bin/qmake")
@@ -69,7 +70,7 @@ SET(qmake_executable "${build_prefix}/QT/bin/qmake")
 
 #=========================================================
 # VTK
-SET(VTK_CMAKE_CXX_STANDARD_LIBRARIES "${VTK_CMAKE_CXX_STANDARD_LIBRARIES}")
+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)
@@ -140,13 +141,17 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   SET(VV_CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
+SET(MAKE_COMMAND "make")
+if(MSVC)
+  SET(MAKE_COMMAND "nmake")
+endif(MSVC)
+
 ExternalProject_Add(
   VV
   DEPENDS QT VTK ITK
   SOURCE_DIR ${source_prefix}/vv
   GIT_REPOSITORY git://git.creatis.insa-lyon.fr/clitk
-  GIT_TAG HEAD
-  INSTALL_COMMAND ""
+  INSTALL_COMMAND ${MAKE_COMMAND} package
   CMAKE_ARGS
     -DQT_QMAKE_EXECUTABLE:FILEPATH=${qmake_executable}
     -DITK_DIR:PATH=${ITK_DIR}