From a2272eba8a3886a8065af00db3c4b591d7ae8398 Mon Sep 17 00:00:00 2001 From: Pranav Srinivas Kumar Date: Tue, 4 Feb 2020 07:45:47 -0600 Subject: [PATCH] Closes #26 --- CMakeLists.txt | 34 +++++++++++++++++----------------- demo/CMakeLists.txt | 2 +- indicaConfig.cmake.in | 9 --------- indicatorsConfig.cmake.in | 9 +++++++++ samples/CMakeLists.txt | 16 ++++++++-------- 5 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 indicaConfig.cmake.in create mode 100644 indicatorsConfig.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 08d7903..70e8378 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.8) -project(indica VERSION 1.0.0 LANGUAGES CXX) -option(INDICA_BUILD_TESTS OFF) +project(indicators VERSION 1.5.0 LANGUAGES CXX) +option(INDICATORS_BUILD_TESTS OFF) option(SAMPLES "Build Samples" OFF) option(DEMO "Build Demo" OFF) @@ -9,14 +9,14 @@ include(GNUInstallDirs) find_package(Threads REQUIRED) -add_library(indica INTERFACE) -add_library(indica::indica ALIAS indica) +add_library(indicators INTERFACE) +add_library(indicators::indicators ALIAS indicators) -target_compile_features(indica INTERFACE cxx_std_11) -target_include_directories(indica INTERFACE +target_compile_features(indicators INTERFACE cxx_std_11) +target_include_directories(indicators INTERFACE $ $) -target_link_libraries(indica INTERFACE Threads::Threads) +target_link_libraries(indicators INTERFACE Threads::Threads) if( DEMO ) @@ -27,17 +27,17 @@ 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) +configure_package_config_file(indicatorsConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/indicatorsConfig.cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/indicators) -install(TARGETS indica EXPORT indicaTargets) -install(EXPORT indicaTargets - FILE indicaTargets.cmake - NAMESPACE indica:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/indica) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/indicaConfig.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/indica) +install(TARGETS indicators EXPORT indicatorsTargets) +install(EXPORT indicatorsTargets + FILE indicatorsTargets.cmake + NAMESPACE indicators:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/indicators) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/indicatorsConfig.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/indicators) install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/include/indicators DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} USE_SOURCE_PERMISSIONS diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt index b64f8b9..798ae5e 100644 --- a/demo/CMakeLists.txt +++ b/demo/CMakeLists.txt @@ -1,2 +1,2 @@ add_executable(demo demo.cpp) -target_link_libraries(demo PRIVATE indica::indica) +target_link_libraries(demo PRIVATE indicators::indicators) diff --git a/indicaConfig.cmake.in b/indicaConfig.cmake.in deleted file mode 100644 index 776c8b2..0000000 --- a/indicaConfig.cmake.in +++ /dev/null @@ -1,9 +0,0 @@ -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) - -find_dependency(Threads) - -if (NOT TARGET indica::indica) - include(${CMAKE_CURRENT_LIST_DIR}/indicaTargets.cmake) -endif () diff --git a/indicatorsConfig.cmake.in b/indicatorsConfig.cmake.in new file mode 100644 index 0000000..ff85be8 --- /dev/null +++ b/indicatorsConfig.cmake.in @@ -0,0 +1,9 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +find_dependency(Threads) + +if (NOT TARGET indicators::indicators) + include(${CMAKE_CURRENT_LIST_DIR}/indicatorsTargets.cmake) +endif () diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 99f6e5c..01b3212 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -1,24 +1,24 @@ add_executable(block_progress_bar block_progress_bar.cpp) -target_link_libraries(block_progress_bar PRIVATE indica::indica) +target_link_libraries(block_progress_bar PRIVATE indicators::indicators) add_executable(multi_threaded_bar multi_threaded_bar.cpp) -target_link_libraries(multi_threaded_bar PRIVATE indica::indica) +target_link_libraries(multi_threaded_bar PRIVATE indicators::indicators) add_executable(progress_bar_set_progress progress_bar_set_progress.cpp) -target_link_libraries(progress_bar_set_progress PRIVATE indica::indica) +target_link_libraries(progress_bar_set_progress PRIVATE indicators::indicators) add_executable(progress_bar_tick progress_bar_tick.cpp) -target_link_libraries(progress_bar_tick PRIVATE indica::indica) +target_link_libraries(progress_bar_tick PRIVATE indicators::indicators) add_executable(progress_spinner progress_spinner.cpp) -target_link_libraries(progress_spinner PRIVATE indica::indica) +target_link_libraries(progress_spinner PRIVATE indicators::indicators) add_executable(time_meter time_meter.cpp) -target_link_libraries(time_meter PRIVATE indica::indica) +target_link_libraries(time_meter PRIVATE indicators::indicators) add_executable(multi_progress_bar multi_progress_bar.cpp) -target_link_libraries(multi_progress_bar PRIVATE indica::indica) +target_link_libraries(multi_progress_bar PRIVATE indicators::indicators) add_executable(multi_block_progress_bar multi_block_progress_bar.cpp) -target_link_libraries(multi_block_progress_bar PRIVATE indica::indica) +target_link_libraries(multi_block_progress_bar PRIVATE indicators::indicators)