Fix build issue with locating freetype on Linux

CesiumGS · Apr 11, 2023 · 1429d37 · 1429d37
1 parent a4e5012
commit 1429d37
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
@@ -6,7 +6,7 @@ function(setup_lib)
         ""
         ""
         "TARGET_NAME;TYPE"
-        "SOURCES;INCLUDE_DIRS;PRIVATE_INCLUDE_DIRS;LIBRARIES;ADDITIONAL_LIBRARIES;DEPENDENCIES;CXX_FLAGS;CXX_FLAGS_DEBUG;CXX_DEFINES;CXX_DEFINES_DEBUG"
+        "SOURCES;INCLUDE_DIRS;PRIVATE_INCLUDE_DIRS;LIBRARIES;ADDITIONAL_LIBRARIES;ADDITIONAL_LINK_DIRECTORIES;DEPENDENCIES;CXX_FLAGS;CXX_FLAGS_DEBUG;CXX_DEFINES;CXX_DEFINES_DEBUG"
         ${ARGN})
 
     if(_TYPE)
@@ -44,6 +44,10 @@ function(setup_lib)
         target_link_libraries(${_TARGET_NAME} PUBLIC gcov)
     endif()
 
+    if (_ADDITIONAL_LINK_DIRECTORIES)
+        target_link_directories(${_TARGET_NAME} PUBLIC ${_ADDITIONAL_LINK_DIRECTORIES})
+    endif()
+
     if(WIN32 AND ${TYPE} STREQUAL "SHARED")
         add_custom_command(
             TARGET ${_TARGET_NAME}

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -350,5 +350,11 @@ else()
         # This is where freetype is located on Linux
         "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/kit-sdk/plugins")
 
+    set(NVIDIA_ADDITIONAL_LINK_DIRECTORIES
+        # This is where freetype is located on Linux
+        # Needed by imgui which doesn't set its rpath properly
+        "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/kit-sdk/plugins")
+
     set_property(GLOBAL PROPERTY NVIDIA_ADDITIONAL_SEARCH_PATHS_PROPERTY "${NVIDIA_ADDITIONAL_SEARCH_PATHS}")
+    set_property(GLOBAL PROPERTY NVIDIA_ADDITIONAL_LINK_DIRECTORIES_PROPERTY "${NVIDIA_ADDITIONAL_LINK_DIRECTORIES}")
 endif()
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -19,6 +19,7 @@ include(Macros)
 glob_files(SOURCES "${CMAKE_CURRENT_LIST_DIR}/src/*.cpp")
 
 get_property(ADDITIONAL_LIBRARIES GLOBAL PROPERTY NVIDIA_ADDITIONAL_LIBRARIES_PROPERTY)
+get_property(ADDITIONAL_LINK_DIRECTORIES GLOBAL PROPERTY NVIDIA_ADDITIONAL_LINK_DIRECTORIES_PROPERTY)
 
 # cmake-format: off
 setup_lib(
@@ -89,6 +90,8 @@ setup_lib(
         python37
     ADDITIONAL_LIBRARIES
         "${ADDITIONAL_LIBRARIES}"
+    ADDITIONAL_LINK_DIRECTORIES
+        "${ADDITIONAL_LINK_DIRECTORIES}"
     DEPENDENCIES
         cesium-native-external
     CXX_FLAGS