this repo has no description
Merge pull request #1574 from darlinghq/fedora_42_fix
Fix Building For Fedora 42
authored by
CuriousTommy
and committed by
GitHub
83c14ddd
1ffbe0da
+8
-4
+6
-2
cmake/wrap_elf.cmake
+6
-2
cmake/wrap_elf.cmake
···
1
+
if(COMMAND cmake_policy)
2
+
# cmake_policy(SET CMP0177 NEW)
3
+
endif(COMMAND cmake_policy)
4
+
1
5
include(darling_lib)
2
6
#include(CMakeParseArguments)
3
7
···
15
19
)
16
20
17
21
if (ARGC LESS 3)
18
-
set(destination "/usr/lib/native")
22
+
set(destination "usr/lib/native")
19
23
else (ARGC LESS 3)
20
24
set(destination ${ARGV2})
21
25
endif (ARGC LESS 3)
22
26
23
-
set(DYLIB_INSTALL_NAME "${destination}/lib${name}.dylib")
27
+
set(DYLIB_INSTALL_NAME "/${destination}/lib${name}.dylib")
24
28
include_directories(${CMAKE_SOURCE_DIR}/src/startup/mldr/elfcalls)
25
29
add_darling_library(${name} SHARED ${CMAKE_CURRENT_BINARY_DIR}/${name}.c)
26
30
target_link_libraries(${name} PRIVATE system)
+2
-2
src/native/CMakeLists.txt
+2
-2
src/native/CMakeLists.txt
···
19
19
wrap_elf(xkbfile libxkbfile.so)
20
20
wrap_elf(cairo libcairo.so)
21
21
wrap_elf(dbus libdbus-1.so)
22
-
wrap_elf(GL libGL.so "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries")
23
-
wrap_elf(GLU libGLU.so "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries")
22
+
wrap_elf(GL libGL.so "System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries")
23
+
wrap_elf(GLU libGLU.so "System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries")
24
24
endif()