j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

test/cmake_import: Pass the generator platform required by MSVC 2019

Browse source
This commit is contained in:
Thomas Braun 2019-10-15 22:36:54 +02:00
parent 7a521150aa
commit 5541a2bd25
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/cmake_import/CMakeLists.txt
View file

@ -1,6 +1,7 @@
add_test(NAME cmake_import_configure add_test(NAME cmake_import_configure
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-G "${CMAKE_GENERATOR}" -G "${CMAKE_GENERATOR}"
-A "${CMAKE_GENERATOR_PLATFORM}"
-Dnlohmann_json_DIR=${PROJECT_BINARY_DIR} -Dnlohmann_json_DIR=${PROJECT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/project ${CMAKE_CURRENT_SOURCE_DIR}/project
) )

1
test/cmake_import_minver/CMakeLists.txt
View file

@ -1,6 +1,7 @@
add_test(NAME cmake_import_minver_configure add_test(NAME cmake_import_minver_configure
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-G "${CMAKE_GENERATOR}" -G "${CMAKE_GENERATOR}"
-A "${CMAKE_GENERATOR_PLATFORM}"
-Dnlohmann_json_DIR=${PROJECT_BINARY_DIR} -Dnlohmann_json_DIR=${PROJECT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/project ${CMAKE_CURRENT_SOURCE_DIR}/project
) )