diff --git a/support/appveyor-build.py b/support/appveyor-build.py index 4967ae3b..6ffdbd4d 100755 --- a/support/appveyor-build.py +++ b/support/appveyor-build.py @@ -24,8 +24,8 @@ else: if platform == 'x64': generator += ' Win64' cmake_command.append('-G' + generator) - build_command = ['msbuild', '/m:4', '/p:Config=' + config, 'FORMAT.sln'] - test_command = ['msbuild', 'RUN_TESTS.vcxproj'] + build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:4'], + test_command = ['ctest', '-C', config] check_call(cmake_command) check_call(build_command) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0a73de42..84acaef9 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -115,6 +115,7 @@ add_test(compile-test ${CMAKE_CTEST_COMMAND} # test if the targets are findable from the build directory add_test(find-package-test ${CMAKE_CTEST_COMMAND} + -C ${CMAKE_BUILD_TYPE} --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/find-package-test" "${CMAKE_CURRENT_BINARY_DIR}/find-package-test"