Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cmake] Fix libneko.so loading error when installing to /usr/local #271

Merged
merged 3 commits into from
May 9, 2024
Merged

[cmake] Fix libneko.so loading error when installing to /usr/local #271

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cf2e78
[cmake] Add install library path to rpath
tobil4sk Jan 31, 2023
53c000f
[cmake] Don't set LD_LIBRARY_PATH during tests
tobil4sk Mar 30, 2023
5dd4dbe
[cmake] Clean up rpath settings
tobil4sk May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 6 additions & 26 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,23 +158,19 @@ endforeach()

include(ExternalProject)


# CMAKE_BUILD_WITH_INSTALL_RPATH should be set to true.
# It is because `nekotools boot` will use the neko in build dir during build.
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)

if (RELOCATABLE)
# https://cmake.org/Wiki/CMake_RPATH_handling
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_SKIP_INSTALL_RPATH FALSE)
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
# Set this to true, otherwise the binaries won't be relocatable until after installation:
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
if(APPLE)
set(CMAKE_MACOSX_RPATH TRUE)
set(CMAKE_INSTALL_RPATH @executable_path/)
elseif(UNIX)
set(CMAKE_INSTALL_RPATH \$ORIGIN)
endif()
endif()

list(APPEND CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
tobil4sk marked this conversation as resolved.
Show resolved Hide resolved

if(UNIX AND NOT APPLE)
add_definitions(-DABI_ELF)
endif()
Expand Down Expand Up @@ -395,12 +391,9 @@ set_target_properties(libneko
if (CMAKE_HOST_WIN32)
set(set_neko_env set NEKOPATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
set(neko_exec $<TARGET_FILE:nekovm>)
elseif(CMAKE_HOST_APPLE)
set(set_neko_env "")
set(neko_exec DYLD_FALLBACK_LIBRARY_PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} NEKOPATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} $<TARGET_FILE:nekovm>)
else()
set(set_neko_env "")
set(neko_exec LD_LIBRARY_PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} NEKOPATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} $<TARGET_FILE:nekovm>)
set(neko_exec NEKOPATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} $<TARGET_FILE:nekovm>)
endif()

file(GLOB compilers_src
Expand Down Expand Up @@ -781,26 +774,13 @@ if (WITH_NEKOML)
COMMAND nekoml
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
)

set_tests_properties(nekoml
PROPERTIES
ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
)
endif()

add_test(NAME nekotools
COMMAND nekotools
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
)

if (UNIX AND NOT APPLE)
set_tests_properties(-version test.n nekoc nekotools
PROPERTIES
ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
)
endif()


#######################

# debian source packages
Expand Down