From 167461ccc4b740a0a0c2146a275a7efb436b9c1b Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Fri, 19 Mar 2021 22:51:50 +0100 Subject: [PATCH] rename internal name mapnik-core to core since the exported name would be mapnik::mapnik-core instead of mapnik::core. This fixes the issue --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f4e3fd84..b6a4e4993 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,10 +224,10 @@ if(NOT WIN32) list(APPEND MAPNIK_OPTIONAL_LIBS ${CMAKE_DL_LIBS}) endif() -add_library(mapnik-core INTERFACE) -add_library(mapnik::core ALIAS mapnik-core) +add_library(core INTERFACE) +add_library(mapnik::core ALIAS core) -target_include_directories(mapnik-core INTERFACE +target_include_directories(core INTERFACE $ $ $ @@ -237,7 +237,7 @@ target_include_directories(mapnik-core INTERFACE $ ${MAPNIK_OPTIONAL_LIBS_INCLUDE} ) -target_link_libraries(mapnik-core INTERFACE +target_link_libraries(core INTERFACE Boost::headers Boost::regex Boost::filesystem @@ -248,9 +248,9 @@ target_link_libraries(mapnik-core INTERFACE harfbuzz::harfbuzz ${MAPNIK_OPTIONAL_LIBS} ) -target_compile_definitions(mapnik-core INTERFACE ${MAPNIK_COMPILE_DEFS}) +target_compile_definitions(core INTERFACE ${MAPNIK_COMPILE_DEFS}) -install(TARGETS mapnik-core +install(TARGETS core EXPORT MapnikTargets LIBRARY DESTINATION ${MAPNIK_LIB_DIR} ARCHIVE DESTINATION ${MAPNIK_ARCHIVE_DIR}