From 373c8e0c1fb030b2bb95e44c249555dd8513127f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Karas?= Date: Fri, 29 Dec 2023 17:20:07 +0100 Subject: [PATCH 1/3] typo --- Import/src/Import.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Import/src/Import.cpp b/Import/src/Import.cpp index f4ef7d4f0..f2b7b5273 100644 --- a/Import/src/Import.cpp +++ b/Import/src/Import.cpp @@ -34,7 +34,7 @@ #include -static std::string VehcileMaskToString(osmscout::VehicleMask vehicleMask) +static std::string VehicleMaskToString(osmscout::VehicleMask vehicleMask) { std::string result; @@ -308,7 +308,7 @@ static void DumpParameter(const osmscout::ImportParameter& parameter, for (const auto& router : parameter.GetRouter()) { - progress.Info(std::string("Router: ")+VehcileMaskToString(router.GetVehicleMask())+ " - '"+router.GetFilenamebase()+"'"); + progress.Info(std::string("Router: ") + VehicleMaskToString(router.GetVehicleMask()) + " - '" + router.GetFilenamebase() + "'"); } progress.Info(std::string("StrictAreas: ")+ From a326afb023f1468824694bd175506bc4bf2ad710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Karas?= Date: Fri, 29 Dec 2023 18:15:37 +0100 Subject: [PATCH 2/3] setup CMake HAVE_* variables in configure stage, not using generator expressions --- cmake/features.cmake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/cmake/features.cmake b/cmake/features.cmake index 089af8b32..5fd4973f4 100644 --- a/cmake/features.cmake +++ b/cmake/features.cmake @@ -140,6 +140,14 @@ if(NOT BUILD_SHARED_LIBS AND (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLAN endif() # check libraries and tools +macro(target_exists target var) + if(TARGET ${target}) + set(${var} 1) + else() + set(${var} 0) + endif() +endmacro() + if(NOT IOS) find_package(Marisa) endif() @@ -160,17 +168,17 @@ if (TARGET LibXml2::LibXml2 AND NOT BUILD_SHARED_LIBS) list(APPEND LIBXML2_LIBRARIES "dl") endif() endif() -set(HAVE_LIB_XML $) -set(OSMSCOUT_GPX_HAVE_LIB_XML $) +target_exists(LibXml2::LibXml2 HAVE_LIB_XML) +target_exists(LibXml2::LibXml2 OSMSCOUT_GPX_HAVE_LIB_XML) find_package(Protobuf QUIET) if (TARGET protobuf::libprotobuf AND NOT EXISTS ${PROTOBUF_PROTOC_EXECUTABLE}) message(STATUS "Protobuf library found, but protoc compiler is missing") endif() -set(HAVE_LIB_PROTOBUF $) +target_exists(protobuf::libprotobuf HAVE_LIB_PROTOBUF) find_package(ZLIB QUIET) -set(HAVE_LIB_ZLIB $) +target_exists(ZLIB::ZLIB HAVE_LIB_ZLIB) find_package(Iconv QUIET) if(TARGET Iconv::Iconv) @@ -223,7 +231,7 @@ set(OSMSCOUT_MAP_CAIRO_HAVE_LIB_PANGO ${PANGOCAIRO_FOUND}) set(OSMSCOUT_MAP_SVG_HAVE_LIB_PANGO ${PANGOFT2_FOUND}) find_package(harfbuzz QUIET) -set(HAVE_LIB_HARFBUZZ $) +target_exists(harfbuzz::harfbuzz HAVE_LIB_HARFBUZZ) set(OpenGL_GL_PREFERENCE "GLVND") # Prever non-legacy OpenGL libraries find_package(OpenGL QUIET) From 99c04e3bab65b3e886d280af0377b3e3f2d2fa1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Karas?= Date: Fri, 29 Dec 2023 18:31:43 +0100 Subject: [PATCH 3/3] fix glm target, use glm::glm --- CMakeLists.txt | 6 +++--- cmake/features.cmake | 2 +- libosmscout-map-opengl/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25632c539..5fce3b074 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,7 +307,7 @@ else() set(OSMSCOUT_BUILD_MAP_IOSX OFF CACHE INTERNAL "" FORCE) endif() -if(OPENGL_FOUND AND GLEW_FOUND AND TARGET glm AND PNG_FOUND AND OSMSCOUT_BUILD_MAP) +if(OPENGL_FOUND AND GLEW_FOUND AND TARGET glm::glm AND PNG_FOUND AND OSMSCOUT_BUILD_MAP) set(OSMSCOUT_BUILD_MAP_OPENGL_CACHE ON) else() set(OSMSCOUT_BUILD_MAP_OPENGL_CACHE OFF) @@ -330,7 +330,7 @@ if(OSMSCOUT_BUILD_MAP_OPENGL) message(SEND_ERROR "GLEW is required for OpenGL map drawing backend") set(OSMSCOUT_BUILD_MAP_OPENGL OFF) endif() - if(NOT TARGET glm) + if(NOT TARGET glm::glm) message(SEND_ERROR "GLM is required for OpenGL map drawing backend") set(OSMSCOUT_BUILD_MAP_OPENGL OFF) endif() @@ -547,7 +547,7 @@ endif() message(STATUS) message(STATUS "Dependencies:") -if (TARGET glm) +if (TARGET glm::glm) message(STATUS "- glm: TRUE") else () message(STATUS "- glm: FALSE") diff --git a/cmake/features.cmake b/cmake/features.cmake index 5fd4973f4..0fbd996aa 100644 --- a/cmake/features.cmake +++ b/cmake/features.cmake @@ -240,7 +240,7 @@ set(HAVE_LIB_OPENGL ${OPENGL_FOUND}) find_package(GLEW QUIET) find_package(glm QUIET) -if(NOT TARGET glm) +if(NOT TARGET glm::glm) message(STATUS "glm NOT found") find_package(Git QUIET) if(Git_FOUND) diff --git a/libosmscout-map-opengl/CMakeLists.txt b/libosmscout-map-opengl/CMakeLists.txt index c3113f4d3..a92eb329f 100644 --- a/libosmscout-map-opengl/CMakeLists.txt +++ b/libosmscout-map-opengl/CMakeLists.txt @@ -69,7 +69,7 @@ osmscout_library_project( HEADER ${HEADER_FILES} INCLUDEDIR osmscoutmapopengl TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/include/osmscoutmapopengl/MapOpenGLFeatures.h.cmake - TARGET OSMScout::OSMScout OSMScout::Map OpenGL::GL glm GLEW::GLEW PNG::PNG Freetype::Freetype + TARGET OSMScout::OSMScout OSMScout::Map OpenGL::GL glm::glm GLEW::GLEW PNG::PNG Freetype::Freetype ) if(APPLE AND OSMSCOUT_BUILD_FRAMEWORKS)