diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 36592bafc..434b98402 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -176,7 +176,8 @@ install(FILES fish.png DESTINATION ${rel_datadir}/pixmaps) # Group install targets into a InstallTargets folder set_property(TARGET build_fish_pc CHECK-FISH-BUILD-VERSION-FILE # test_fishscript - test_prep tests_buildroot_target + # test_prep + tests_buildroot_target PROPERTY FOLDER cmake/InstallTargets) # Make a target build_root that installs into the buildroot directory, for testing. diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake index 85cd2228e..80b3ae79a 100644 --- a/cmake/Tests.cmake +++ b/cmake/Tests.cmake @@ -115,8 +115,8 @@ foreach(LTEST ${LOW_LEVEL_TESTS}) ) endforeach(LTEST) -add_test(test_prep - "${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR} --target test_prep) +add_test(tests_buildroot_target + "${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR} --target tests_buildroot_target) FILE(GLOB FISH_CHECKS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/checks/*.fish) foreach(CHECK ${FISH_CHECKS}) get_filename_component(CHECK_NAME ${CHECK} NAME) @@ -127,5 +127,5 @@ foreach(CHECK ${FISH_CHECKS}) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests ) - set_tests_properties(${LTEST} PROPERTIES DEPENDS test_prep) + set_tests_properties(${LTEST} PROPERTIES DEPENDS tests_buildroot_target) endforeach(CHECK)