Merge pull request #1548 from Karry/cmake-fixes

CMake fixes
Framstag · Dec 30, 2023 · 5086f65 · 5086f65
2 parents 8c5d070 + 99c04e3
commit 5086f65
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git 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/Import/src/Import.cpp b/Import/src/Import.cpp
@@ -34,7 +34,7 @@
 
 #include <osmscoutimport/Import.h>
 
-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: ")+

diff --git 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 $<TARGET_EXISTS:LibXml2>)
-set(OSMSCOUT_GPX_HAVE_LIB_XML $<TARGET_EXISTS:LibXml2>)
+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>)
+target_exists(protobuf::libprotobuf HAVE_LIB_PROTOBUF)
 
 find_package(ZLIB QUIET)
-set(HAVE_LIB_ZLIB $<TARGET_EXISTS:ZLIB::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>)
+target_exists(harfbuzz::harfbuzz HAVE_LIB_HARFBUZZ)
 
 set(OpenGL_GL_PREFERENCE "GLVND") # Prever non-legacy OpenGL libraries
 find_package(OpenGL QUIET)
@@ -232,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
@@ -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)