Cleanup CMake (output)

This commit is contained in:
Dominik Schmidt 2018-11-13 12:01:23 -08:00 committed by Kevin Ottens
parent f074c1a07b
commit 1104883fba
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
2 changed files with 8 additions and 7 deletions

View file

@ -1,14 +1,16 @@
list(APPEND vfsPlugins "suffix")
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/win")
list(APPEND vfsPlugins "win")
endif()
file(GLOB vfsPlugins RELATIVE ${CMAKE_CURRENT_LIST_DIR} "*")
foreach(vfsPlugin ${vfsPlugins})
message(STATUS "Add vfsPlugin in dir: ${vfsPlugin}")
if(NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/${vfsPlugin}")
continue()
endif()
add_subdirectory("${vfsPlugin}")
if(UNIT_TESTING AND IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/${vfsPlugin}/test")
message(STATUS "Add vfsPlugin tests in dir: ${vfsPlugin}")
add_subdirectory("${vfsPlugin}/test" "${vfsPlugin}_test")
message(STATUS "Added vfsPlugin with tests: ${vfsPlugin}")
else()
message(STATUS "Added vfsPlugin without tests: ${vfsPlugin}")
endif()
endforeach()

View file

@ -21,7 +21,6 @@ macro(nextcloud_add_test test_class additional_cpp)
add_definitions(-DOWNCLOUD_TEST)
add_definitions(-DOWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
message(STATUS "Add test: ${OWNCLOUD_TEST_CLASS}Test")
add_test(NAME ${OWNCLOUD_TEST_CLASS}Test
COMMAND ${OWNCLOUD_TEST_CLASS}Test
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin")