From e1bfc41a162a8c701921340e3fff0f20a12d55a5 Mon Sep 17 00:00:00 2001 From: daixtrose Date: Mon, 8 Jun 2015 17:04:05 +0200 Subject: Modified CMake files to put all examples below one folder This commit leads to crazy build problems --- Rx/v2/examples/cep/CMakeLists.txt | 2 ++ Rx/v2/examples/println/CMakeLists.txt | 2 ++ Rx/v2/examples/pythagorian/CMakeLists.txt | 2 ++ Rx/v2/examples/stop/CMakeLists.txt | 2 ++ Rx/v2/examples/tests/CMakeLists.txt | 2 ++ projects/CMake/CMakeLists.txt | 2 ++ 6 files changed, 12 insertions(+) diff --git a/Rx/v2/examples/cep/CMakeLists.txt b/Rx/v2/examples/cep/CMakeLists.txt index 542a858..c99c723 100644 --- a/Rx/v2/examples/cep/CMakeLists.txt +++ b/Rx/v2/examples/cep/CMakeLists.txt @@ -31,6 +31,8 @@ target_link_libraries(${SAMPLE_PROJECT} ${CMAKE_THREAD_LIBS_INIT}) enable_testing() set(CTEST_CONFIGURATION_TYPE "${JOB_BUILD_CONFIGURATION}") +set_target_properties(${SAMPLE_PROJECT} PROPERTIES FOLDER "Examples") + add_test(NAME RunTests WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" COMMAND ${SAMPLE_PROJECT} ${TEST_ARGS}) diff --git a/Rx/v2/examples/println/CMakeLists.txt b/Rx/v2/examples/println/CMakeLists.txt index 82cd2a4..3bf2979 100644 --- a/Rx/v2/examples/println/CMakeLists.txt +++ b/Rx/v2/examples/println/CMakeLists.txt @@ -29,6 +29,8 @@ target_link_libraries(${SAMPLE_PROJECT} ${CMAKE_THREAD_LIBS_INIT}) enable_testing() set(CTEST_CONFIGURATION_TYPE "${JOB_BUILD_CONFIGURATION}") +set_target_properties(${SAMPLE_PROJECT} PROPERTIES FOLDER "Examples") + add_test(NAME RunTests WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" COMMAND ${SAMPLE_PROJECT} ${TEST_ARGS}) diff --git a/Rx/v2/examples/pythagorian/CMakeLists.txt b/Rx/v2/examples/pythagorian/CMakeLists.txt index 82cd2a4..3bf2979 100644 --- a/Rx/v2/examples/pythagorian/CMakeLists.txt +++ b/Rx/v2/examples/pythagorian/CMakeLists.txt @@ -29,6 +29,8 @@ target_link_libraries(${SAMPLE_PROJECT} ${CMAKE_THREAD_LIBS_INIT}) enable_testing() set(CTEST_CONFIGURATION_TYPE "${JOB_BUILD_CONFIGURATION}") +set_target_properties(${SAMPLE_PROJECT} PROPERTIES FOLDER "Examples") + add_test(NAME RunTests WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" COMMAND ${SAMPLE_PROJECT} ${TEST_ARGS}) diff --git a/Rx/v2/examples/stop/CMakeLists.txt b/Rx/v2/examples/stop/CMakeLists.txt index 82cd2a4..3bf2979 100644 --- a/Rx/v2/examples/stop/CMakeLists.txt +++ b/Rx/v2/examples/stop/CMakeLists.txt @@ -29,6 +29,8 @@ target_link_libraries(${SAMPLE_PROJECT} ${CMAKE_THREAD_LIBS_INIT}) enable_testing() set(CTEST_CONFIGURATION_TYPE "${JOB_BUILD_CONFIGURATION}") +set_target_properties(${SAMPLE_PROJECT} PROPERTIES FOLDER "Examples") + add_test(NAME RunTests WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" COMMAND ${SAMPLE_PROJECT} ${TEST_ARGS}) diff --git a/Rx/v2/examples/tests/CMakeLists.txt b/Rx/v2/examples/tests/CMakeLists.txt index af849ff..690930d 100644 --- a/Rx/v2/examples/tests/CMakeLists.txt +++ b/Rx/v2/examples/tests/CMakeLists.txt @@ -30,6 +30,8 @@ target_link_libraries(${SAMPLE_PROJECT} ${CMAKE_THREAD_LIBS_INIT}) enable_testing() set(CTEST_CONFIGURATION_TYPE "${JOB_BUILD_CONFIGURATION}") +set_target_properties(${SAMPLE_PROJECT} PROPERTIES FOLDER "Examples") + add_test(NAME RunTests WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" COMMAND ${SAMPLE_PROJECT} ${TEST_ARGS}) diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index 77a7123..753eb70 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.2 FATAL_ERROR) project(rxcpp VERSION 2.2.4 LANGUAGES C CXX) +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + # define some folders get_filename_component(RXCPP_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PATH) -- cgit v1.2.3