COMP: Ensure external projects are built with the expected compilers

This ensures the C & C++ compilers associated with the top-level project are used consistently. Note that CMAKE_CXX_COMPILER is not associated with the "openjpeg" external project because the project only specifies C as a language.
rordenlab · Apr 19, 2023 · baf9c75 · baf9c75
1 parent 4aa258b
commit baf9c75
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/SuperBuild/External-CLOUDFLARE-ZLIB.cmake b/SuperBuild/External-CLOUDFLARE-ZLIB.cmake
@@ -9,6 +9,9 @@ ExternalProject_Add(zlib
         -Wno-dev
         ${OSX_ARCHITECTURES}
         -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+        # Compiler settings
+        -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+        -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
         # Install directories
         -DCMAKE_INSTALL_PREFIX:PATH=${DEP_INSTALL_DIR}
 )

diff --git a/SuperBuild/External-OPENJPEG.cmake b/SuperBuild/External-OPENJPEG.cmake
@@ -10,6 +10,9 @@ ExternalProject_Add(openjpeg
         --no-warn-unused-cli
         ${OSX_ARCHITECTURES}
         -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+        # Compiler settings
+        -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+        # Not used -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
         # Install directories
         -DCMAKE_INSTALL_PREFIX:PATH=${DEP_INSTALL_DIR}
 )

diff --git a/SuperBuild/External-YAML-CPP.cmake b/SuperBuild/External-YAML-CPP.cmake
@@ -10,6 +10,9 @@ ExternalProject_Add(yaml-cpp
         --no-warn-unused-cli
         ${OSX_ARCHITECTURES}
         -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+        # Compiler settings
+        -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+        -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
         # Install directories
         -DCMAKE_INSTALL_PREFIX:PATH=${DEP_INSTALL_DIR}
 )

diff --git a/SuperBuild/SuperBuild.cmake b/SuperBuild/SuperBuild.cmake
@@ -156,7 +156,9 @@ ExternalProject_Add(console
         # Install directories
         -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}
         # Compiler settings
+        -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
         -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
+        -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
         -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
         # Options
         -DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}