Update tests that generate CMake projects to use the CMAKE_CXX_COMPIL…

…ER the main project was CMake'd with. Fixes nlohmann#1747.
Tridacnid · Nov 19, 2019 · fbb0bd7 · fbb0bd7
1 parent 67259d6
commit fbb0bd7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/test/cmake_add_subdirectory/CMakeLists.txt b/test/cmake_add_subdirectory/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_test(NAME cmake_add_subdirectory_configure
   COMMAND ${CMAKE_COMMAND}
     -G "${CMAKE_GENERATOR}"
+    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
     -Dnlohmann_json_source=${PROJECT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/project
 )

diff --git a/test/cmake_import/CMakeLists.txt b/test/cmake_import/CMakeLists.txt
@@ -2,6 +2,7 @@ add_test(NAME cmake_import_configure
   COMMAND ${CMAKE_COMMAND}
     -G "${CMAKE_GENERATOR}"
     -A "${CMAKE_GENERATOR_PLATFORM}"
+    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
     -Dnlohmann_json_DIR=${PROJECT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/project
 )

diff --git a/test/cmake_import_minver/CMakeLists.txt b/test/cmake_import_minver/CMakeLists.txt
@@ -2,6 +2,7 @@ add_test(NAME cmake_import_minver_configure
   COMMAND ${CMAKE_COMMAND}
     -G "${CMAKE_GENERATOR}"
     -A "${CMAKE_GENERATOR_PLATFORM}"
+    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
     -Dnlohmann_json_DIR=${PROJECT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/project
 )