From ab6424979fc30608da0cf5a192d099ae1e098da0 Mon Sep 17 00:00:00 2001 From: "Thomas A." Date: Fri, 18 Apr 2025 21:54:46 -0700 Subject: [PATCH] Workaround CMP0177 Warning We can't use cmake_policy yet since there are older cmake versions that we still need to support. --- cmake/wrap_elf.cmake | 8 ++++++-- src/native/CMakeLists.txt | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmake/wrap_elf.cmake b/cmake/wrap_elf.cmake index 0ec024f38..f5a194926 100644 --- a/cmake/wrap_elf.cmake +++ b/cmake/wrap_elf.cmake @@ -1,3 +1,7 @@ +if(COMMAND cmake_policy) + # cmake_policy(SET CMP0177 NEW) +endif(COMMAND cmake_policy) + include(darling_lib) #include(CMakeParseArguments) @@ -15,12 +19,12 @@ function(wrap_elf name elfname) ) if (ARGC LESS 3) - set(destination "/usr/lib/native") + set(destination "usr/lib/native") else (ARGC LESS 3) set(destination ${ARGV2}) endif (ARGC LESS 3) - set(DYLIB_INSTALL_NAME "${destination}/lib${name}.dylib") + set(DYLIB_INSTALL_NAME "/${destination}/lib${name}.dylib") include_directories(${CMAKE_SOURCE_DIR}/src/startup/mldr/elfcalls) add_darling_library(${name} SHARED ${CMAKE_CURRENT_BINARY_DIR}/${name}.c) target_link_libraries(${name} PRIVATE system) diff --git a/src/native/CMakeLists.txt b/src/native/CMakeLists.txt index 8ef26ef2f..79e1197dd 100644 --- a/src/native/CMakeLists.txt +++ b/src/native/CMakeLists.txt @@ -19,6 +19,6 @@ if (COMPONENT_gui) wrap_elf(xkbfile libxkbfile.so) wrap_elf(cairo libcairo.so) wrap_elf(dbus libdbus-1.so) - wrap_elf(GL libGL.so "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries") - wrap_elf(GLU libGLU.so "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries") + wrap_elf(GL libGL.so "System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries") + wrap_elf(GLU libGLU.so "System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries") endif() -- 2.51.2