Update tests that generate CMake projects to use the CMAKE_CXX_COMPILER the main project was CMake'd with. Fixes nlohmann#1747.

Tridacnid · Tridacnid · commit fbb0bd7556f1 · 2019-11-18T21:46:34.000-06:00
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
 )

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`add_test(NAME cmake_add_subdirectory_configure`
`2`	`2`	`COMMAND ${CMAKE_COMMAND}`
`3`	`3`	`-G "${CMAKE_GENERATOR}"`
	`4`	`+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}`
`4`	`5`	`-Dnlohmann_json_source=${PROJECT_SOURCE_DIR}`
`5`	`6`	`${CMAKE_CURRENT_SOURCE_DIR}/project`
`6`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ add_test(NAME cmake_import_configure`
`2`	`2`	`COMMAND ${CMAKE_COMMAND}`
`3`	`3`	`-G "${CMAKE_GENERATOR}"`
`4`	`4`	`-A "${CMAKE_GENERATOR_PLATFORM}"`
	`5`	`+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}`
`5`	`6`	`-Dnlohmann_json_DIR=${PROJECT_BINARY_DIR}`
`6`	`7`	`${CMAKE_CURRENT_SOURCE_DIR}/project`
`7`	`8`	`)`