libs: Add OpenCPN#3527 review comments.

Hakansv · Jan 23, 2024 · 91ae80b · 91ae80b
1 parent cd6ba6d
commit 91ae80b
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 1 deletion.
diff --git a/libs/geoprim/CMakeLists.txt b/libs/geoprim/CMakeLists.txt
@@ -4,6 +4,7 @@ if (TARGET ocpn::geoprim)
     return ()
 endif ()
 
+# Fixme (#3527) dependency on main opencpn
 if (NOT CMAKE_MODULE_PATH)
   set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake)
 endif ()
@@ -39,6 +40,7 @@ target_include_directories(GEOPRIM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
 target_include_directories(GEOPRIM PRIVATE ${wxWidgets_INCLUDE_DIRS})
 target_link_libraries(GEOPRIM PRIVATE ${wxWidgets_LIBRARIES})
 
+# Fixme (#3527) dependency on main opencpn
 if (QT_ANDROID)
   target_include_directories(GEOPRIM PRIVATE  ${CMAKE_SOURCE_DIR}/android)
 elseif (MSVC)

diff --git a/libs/glu/CMakeLists.txt b/libs/glu/CMakeLists.txt
@@ -21,6 +21,7 @@ IF(QT_ANDROID)
   ADD_DEFINITIONS( " -fPIC")
 ENDIF(QT_ANDROID)
 
+# Fixme (#3527) dependencies on main opencpn
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(include)
 

diff --git a/libs/gtest/CMakeLists.txt b/libs/gtest/CMakeLists.txt
@@ -4,6 +4,7 @@ if (TARGET ocpn::gtest)
     return ()
 endif ()
 
+# Fixme (#3527) dependency on main opencpn
 if (NOT CMAKE_MODULE_PATH)
   set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake)
 endif ()

diff --git a/libs/libtess2/CMakeLists.txt b/libs/libtess2/CMakeLists.txt
@@ -20,7 +20,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang|AppleClang")
     add_compile_options("-Wno-format" "-Wno-unknown-pragmas")
 endif ()
 
+# Fixme (#3527) dependency on main opencpn
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+
 INCLUDE_DIRECTORIES(Include)
 
 IF(WIN32)

diff --git a/libs/mipmap/CMakeLists.txt b/libs/mipmap/CMakeLists.txt
@@ -4,10 +4,12 @@ if (TARGET ocpn::mipmap)
     return ()
 endif ()
 
+# Fixme (#3527) dependency on main opencpn
 if (NOT CMAKE_MODULE_PATH)
   set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake)
 endif ()
 
+# Fixme (#3527) dependency on main opencpn
 include(GetArch)
 GetArch()
 
@@ -35,6 +37,8 @@ target_include_directories(MIPMAP
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/mipmap
 )
 
+# Fixme (#3527) QT_ANDROID, HAVE_MSSE etc., are from main opencpn.
+# Options needed to make them independent
 if( NOT QT_ANDROID)
   # always use optimizations for the texture compression which is much faster
   if (NOT MSVC)

diff --git a/libs/sound/CMakeLists.txt b/libs/sound/CMakeLists.txt
@@ -4,6 +4,7 @@ if (TARGET ocpn::sound)
   return ()
 endif ()
 
+# Fixme (#3527) dependency on main opencpn
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake ${CMAKE_MODULE_PATH})
 
 find_package(Portaudio)

diff --git a/libs/sqlite/CMakeLists.txt b/libs/sqlite/CMakeLists.txt
@@ -22,7 +22,8 @@ if (NOT SQLITE_FOUND OR APPLE OR WIN32 OR QT_ANDROID)
       _SQLITE INTERFACE ${CMAKE_CURRENT_LIST_DIR}/include
   )
 
-  # We do not need extensions, and using them in a static library causes trouble with libdl linking order.
+  # We do not need extensions, and using them in a static library causes
+  # trouble with libdl linking order.
   if (UNIX AND NOT APPLE)
      add_definitions(" -DSQLITE_OMIT_LOAD_EXTENSION")
   endif (UNIX AND NOT APPLE)

diff --git a/libs/texcmp/CMakeLists.txt b/libs/texcmp/CMakeLists.txt
@@ -15,6 +15,8 @@ if (NOT DEFINED ARCH)
 endif ()
 
 include(FindPkgConfig)
+
+# Fixme (#3527) dependency on main opencpn
 include(CompilerSupport)
 
 set(SRC