Merge pull request #1012 from laurennlam/fix-cmake-generator-plateform

COMP: Fix compilation errors with latest cmake version Pass the value of CMAKE_GENERATOR_PLATFORM to the build commands, which prevents failures if the platform is not x86.
ANTsX · Jun 8, 2020 · 1195345 · 1195345
2 parents 29bdfbd + d9b2929
commit 1195345
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/SuperBuild.cmake b/SuperBuild.cmake
@@ -301,6 +301,7 @@ ExternalProject_Add(${proj}
     ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
     ${COMMON_EXTERNAL_PROJECT_ARGS}
     -D${LOCAL_PROJECT_NAME}_SUPERBUILD:BOOL=OFF
+    -DCMAKE_GENERATOR_PLATFORM:STRING=${CMAKE_GENERATOR_PLATFORM}
   INSTALL_COMMAND ""
   )
 

diff --git a/SuperBuild/External_ITKv5.cmake b/SuperBuild/External_ITKv5.cmake
@@ -171,6 +171,7 @@ if(NOT DEFINED ${extProjName}_DIR AND NOT ${USE_SYSTEM_${extProjName}})
       ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
       ${COMMON_EXTERNAL_PROJECT_ARGS}
       ${${proj}_CMAKE_OPTIONS}
+      -DCMAKE_GENERATOR_PLATFORM:STRING=${CMAKE_GENERATOR_PLATFORM}
 ## We really do want to install in order to limit # of include paths INSTALL_COMMAND ""
     DEPENDS
       ${${proj}_DEPENDENCIES}

diff --git a/SuperBuild/External_KWStyle.cmake b/SuperBuild/External_KWStyle.cmake
@@ -70,6 +70,7 @@ if(NOT DEFINED ${extProjName}_EXE AND NOT ${USE_SYSTEM_${extProjName}})
       ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
       ${COMMON_EXTERNAL_PROJECT_ARGS}
       ${${proj}_CMAKE_OPTIONS}
+      -DCMAKE_GENERATOR_PLATFORM:STRING=${CMAKE_GENERATOR_PLATFORM}
     INSTALL_COMMAND ""
     DEPENDS
       ${${proj}_DEPENDENCIES}

diff --git a/SuperBuild/External_SlicerExecutionModel.cmake b/SuperBuild/External_SlicerExecutionModel.cmake
@@ -85,6 +85,7 @@ if(NOT ( DEFINED "${extProjName}_DIR" OR ( DEFINED "${USE_SYSTEM_${extProjName}}
       ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
       ${COMMON_EXTERNAL_PROJECT_ARGS}
       ${${proj}_CMAKE_OPTIONS}
+      -DCMAKE_GENERATOR_PLATFORM:STRING=${CMAKE_GENERATOR_PLATFORM}
     INSTALL_COMMAND ""
     DEPENDS
       ${${proj}_DEPENDENCIES}

diff --git a/SuperBuild/External_VTK.cmake b/SuperBuild/External_VTK.cmake
@@ -179,6 +179,7 @@ if(NOT ( DEFINED "USE_SYSTEM_${extProjName}" AND "${USE_SYSTEM_${extProjName}}"
       ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
       ${COMMON_EXTERNAL_PROJECT_ARGS}
       ${${proj}_CMAKE_OPTIONS}
+      -DCMAKE_GENERATOR_PLATFORM:STRING=${CMAKE_GENERATOR_PLATFORM}
 ## We really do want to install in order to limit # of include paths INSTALL_COMMAND ""
     DEPENDS
       ${${proj}_DEPENDENCIES}