Mercurial > hg > orthanc-stl

changeset 20:cb7fd3c25f40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added cmake option VTK_BUILD_TYPE
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 12 Sep 2023 13:35:14 +0200
parents 560620c9c5b2
children 42ebec01143b
files CMakeLists.txt Resources/CMake/LibVtkConfiguration.cmake
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Sep 12 12:10:24 2023 +0200
+++ b/CMakeLists.txt	Tue Sep 12 13:35:14 2023 +0200
@@ -65,6 +65,12 @@
 set(USE_SYSTEM_NIFTILIB ON CACHE BOOL "Use the system version of niftilib")
 set(USE_SYSTEM_VTK ON CACHE BOOL "Use the system version of VTK")
 
+# Option "VTK_BUILD_TYPE" is necessary for multi-configuration
+# compilers (such as XCode or MSVC), for "externalproject_add()" to
+# choose the correct build type (which is not known when running
+# "cmake" to configure the project)
+set(VTK_BUILD_TYPE "Release" CACHE STRING "Build type to be used for static builds of VTK (should be \"Debug\" or \"Release\")")
+
 
 #####################################################################
 ## Download and setup the Orthanc framework
--- a/Resources/CMake/LibVtkConfiguration.cmake	Tue Sep 12 12:10:24 2023 +0200
+++ b/Resources/CMake/LibVtkConfiguration.cmake	Tue Sep 12 13:35:14 2023 +0200
@@ -66,12 +66,12 @@
       SOURCE_DIR "${VTK_SOURCES_DIR}"
 
       CMAKE_ARGS
-      -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+      -DCMAKE_BUILD_TYPE:STRING=${VTK_BUILD_TYPE}
       -DCMAKE_CXX_COMPILER=g++
       -DCMAKE_C_COMPILER=gcc
 
       BUILD_COMMAND
-      ${CMAKE_COMMAND} --build <BINARY_DIR> --config ${CMAKE_BUILD_TYPE} --parallel ${NumberOfPhysicalCores} -t
+      ${CMAKE_COMMAND} --build <BINARY_DIR> --config ${VTK_BUILD_TYPE} --parallel ${NumberOfPhysicalCores} -t
       VTKCompileToolsConfig.cmake
 
       INSTALL_COMMAND ""  # Skip the install step
@@ -137,7 +137,7 @@
 
     CMAKE_ARGS
     ${VTKCMakeFlags}
-    -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+    -DCMAKE_BUILD_TYPE:STRING=${VTK_BUILD_TYPE}
     -DBUILD_SHARED_LIBS=OFF
     -DVTK_Group_Rendering=OFF
 
@@ -149,7 +149,7 @@
     -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
 
     BUILD_COMMAND
-    ${CMAKE_COMMAND} --build <BINARY_DIR> --config ${CMAKE_BUILD_TYPE} --parallel ${NumberOfPhysicalCores} -t
+    ${CMAKE_COMMAND} --build <BINARY_DIR> --config ${VTK_BUILD_TYPE} --parallel ${NumberOfPhysicalCores} -t
     vtkCommonCore
     vtkCommonDataModel
     vtkCommonMath