use the cmake and ctest to drive the appveyor build

This commit is contained in:
Mario Werner 2016-02-01 10:22:47 +01:00
parent d3fe82c55b
commit 0a4acc9656
2 changed files with 3 additions and 2 deletions

View File

@ -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)

View File

@ -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"