Commit 0a4acc96 authored by Mario Werner's avatar Mario Werner

use the cmake and ctest to drive the appveyor build

parent d3fe82c5
...@@ -24,8 +24,8 @@ else: ...@@ -24,8 +24,8 @@ else:
if platform == 'x64': if platform == 'x64':
generator += ' Win64' generator += ' Win64'
cmake_command.append('-G' + generator) cmake_command.append('-G' + generator)
build_command = ['msbuild', '/m:4', '/p:Config=' + config, 'FORMAT.sln'] build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:4'],
test_command = ['msbuild', 'RUN_TESTS.vcxproj'] test_command = ['ctest', '-C', config]
check_call(cmake_command) check_call(cmake_command)
check_call(build_command) check_call(build_command)
......
...@@ -115,6 +115,7 @@ add_test(compile-test ${CMAKE_CTEST_COMMAND} ...@@ -115,6 +115,7 @@ add_test(compile-test ${CMAKE_CTEST_COMMAND}
# test if the targets are findable from the build directory # test if the targets are findable from the build directory
add_test(find-package-test ${CMAKE_CTEST_COMMAND} add_test(find-package-test ${CMAKE_CTEST_COMMAND}
-C ${CMAKE_BUILD_TYPE}
--build-and-test --build-and-test
"${CMAKE_CURRENT_SOURCE_DIR}/find-package-test" "${CMAKE_CURRENT_SOURCE_DIR}/find-package-test"
"${CMAKE_CURRENT_BINARY_DIR}/find-package-test" "${CMAKE_CURRENT_BINARY_DIR}/find-package-test"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment