diff --git a/P0267_RefImpl/Samples/maps/CMakeLists.txt b/P0267_RefImpl/Samples/maps/CMakeLists.txt index fdc2720..788e3e6 100644 --- a/P0267_RefImpl/Samples/maps/CMakeLists.txt +++ b/P0267_RefImpl/Samples/maps/CMakeLists.txt @@ -1,7 +1,21 @@ cmake_minimum_required(VERSION 3.0.0) +get_filename_component(SAMPLE_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) +get_filename_component(PROJ_DIR ${SAMPLE_DIR} DIRECTORY) +get_filename_component(TOP_DIR ${PROJ_DIR} DIRECTORY) + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${TOP_DIR}/cmake) set(CMAKE_CXX_STANDARD 17) +# Use the CMakeLists.txt's parent-directory-name for the project's id/name +get_filename_component(PROJECT_ID ${CMAKE_CURRENT_SOURCE_DIR} NAME) +string(REPLACE " " "_" PROJECT_ID ${PROJECT_ID}) +project(${PROJECT_ID}) + find_package(Boost 1.67.0 QUIET COMPONENTS system date_time) +find_package(io2d REQUIRED) +find_package(Cairo) +find_package(GraphicsMagick) + if( NOT Boost_FOUND ) message( "Skipping the Maps example since Boost was not found" ) @@ -16,10 +30,6 @@ endif() add_subdirectory(external/pugixml) -# Use the CMakeLists.txt's parent-directory-name for the project's id/name -get_filename_component(PROJECT_ID ${CMAKE_CURRENT_SOURCE_DIR} NAME) -string(REPLACE " " "_" PROJECT_ID ${PROJECT_ID}) -project(${PROJECT_ID}) add_executable(${PROJECT_ID} main.cpp @@ -32,7 +42,7 @@ add_executable(${PROJECT_ID} ) target_link_libraries(${PROJECT_ID} - io2d + PRIVATE io2d::io2d pugixml ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} @@ -43,7 +53,7 @@ target_include_directories(${PROJECT_ID} SYSTEM ) if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" ) - target_link_libraries(${PROJECT_ID} pthread) + target_link_libraries(${PROJECT_ID} PUBLIC pthread) endif() if(MSVC)