From ab63e2c45b7cca23a66a744472abefbe7fd0c88a Mon Sep 17 00:00:00 2001 From: offa Date: Mon, 16 Dec 2019 18:45:19 +0100 Subject: [PATCH 1/2] CMake support for building the samples added. --- CMakeLists.txt | 6 ++++++ samples/CMakeLists.txt | 15 +++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 samples/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index d71d933..f1b9248 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.8) project(indica VERSION 1.0.0 LANGUAGES CXX) option(INDICA_BUILD_TESTS OFF) +option(SAMPLES "Build Samples" OFF) include(CMakePackageConfigHelpers) include(GNUInstallDirs) @@ -16,6 +17,11 @@ target_include_directories(indica INTERFACE $) target_link_libraries(indica INTERFACE Threads::Threads) + +if( SAMPLES ) + add_subdirectory(samples) +endif() + configure_package_config_file(indicaConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/indicaConfig.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/indica) diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt new file mode 100644 index 0000000..346c227 --- /dev/null +++ b/samples/CMakeLists.txt @@ -0,0 +1,15 @@ + +add_executable(block_progress_bar block_progress_bar.cpp) +target_link_libraries(block_progress_bar PRIVATE indica::indica) + +add_executable(multi_threaded_bar multi_threaded_bar.cpp) +target_link_libraries(multi_threaded_bar PRIVATE indica::indica) + +add_executable(progress_bar_set_progress progress_bar_set_progress.cpp) +target_link_libraries(progress_bar_set_progress PRIVATE indica::indica) + +add_executable(progress_bar_tick progress_bar_tick.cpp) +target_link_libraries(progress_bar_tick PRIVATE indica::indica) + +add_executable(progress_spinner progress_spinner.cpp) +target_link_libraries(progress_spinner PRIVATE indica::indica) From fe388597152ff0db3ed096c401b9fa27255ee501 Mon Sep 17 00:00:00 2001 From: offa Date: Mon, 16 Dec 2019 18:49:06 +0100 Subject: [PATCH 2/2] CMake support for building the demo added. --- CMakeLists.txt | 5 +++++ demo/CMakeLists.txt | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 demo/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index f1b9248..08d7903 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.8) project(indica VERSION 1.0.0 LANGUAGES CXX) option(INDICA_BUILD_TESTS OFF) option(SAMPLES "Build Samples" OFF) +option(DEMO "Build Demo" OFF) include(CMakePackageConfigHelpers) include(GNUInstallDirs) @@ -18,6 +19,10 @@ target_include_directories(indica INTERFACE target_link_libraries(indica INTERFACE Threads::Threads) +if( DEMO ) + add_subdirectory(demo) +endif() + if( SAMPLES ) add_subdirectory(samples) endif() diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt new file mode 100644 index 0000000..b64f8b9 --- /dev/null +++ b/demo/CMakeLists.txt @@ -0,0 +1,2 @@ +add_executable(demo demo.cpp) +target_link_libraries(demo PRIVATE indica::indica)