Skip to content

Commit

Permalink
cmake: don't create relocatable packages by default with non-MSVC too…
Browse files Browse the repository at this point in the history
…lchains
  • Loading branch information
madebr committed Dec 28, 2024
1 parent 85eac24 commit 644bf41
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
11 changes: 8 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ cmake_dependent_option(BUILD_SHARED_LIBS "Build the library as a shared library"

cmake_dependent_option(SDLNET_INSTALL "Enable SDL3_net install target" ${SDLNET_ROOTPROJECT} "${sdl3net_install_enableable}" OFF)
cmake_dependent_option(SDLNET_INSTALL_MAN "Install man pages for SDL3_net" OFF "SDLNET_INSTALL" OFF)
cmake_dependent_option(SDLNET_RELOCATABLE "Create relocatable SDL_net package" "${MSVC}" SDLNET_INSTALL OFF)
option(SDLNET_WERROR "Treat warnings as errors" OFF)

option(SDLNET_SAMPLES "Build the SDL3_net sample program(s)" ${SDLNET_SAMPLES_DEFAULT})
Expand Down Expand Up @@ -233,9 +234,13 @@ if(SDLNET_INSTALL)
COMPONENT devel
)

file(RELATIVE_PATH SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG "${CMAKE_INSTALL_PREFIX}/${SDLNET_PKGCONFIG_INSTALLDIR}" "${CMAKE_INSTALL_PREFIX}")
string(REGEX REPLACE "[/]+$" "" SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG "${SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG}")
set(SDL_PKGCONFIG_PREFIX "\${pcfiledir}/${SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG}")
if(SDLNET_RELOCATABLE)
file(RELATIVE_PATH SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG "${CMAKE_INSTALL_PREFIX}/${SDLNET_PKGCONFIG_INSTALLDIR}" "${CMAKE_INSTALL_PREFIX}")
string(REGEX REPLACE "[/]+$" "" SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG "${SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG}")
set(SDL_PKGCONFIG_PREFIX "\${pcfiledir}/${SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG}")
else()
set(SDL_PKGCONFIG_PREFIX "${CMAKE_PREFIX_PATH}")
endif()

string(JOIN " " PC_REQUIRES ${PC_REQUIRES})
string(JOIN " " PC_LIBS ${PC_LIBS})
Expand Down
2 changes: 2 additions & 0 deletions build-scripts/release-info.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"archs": ["x86", "x64"],
"args": [
"-DBUILD_SHARED_LIBS=ON",
"-DSDLNET_RELOCATABLE=ON",
"-DSDLNET_SAMPLES=OFF",
"-DSDLNET_INSTALL=ON",
"-DSDLNET_INSTALL_MAN=OFF"
Expand Down Expand Up @@ -87,6 +88,7 @@
],
"args": [
"-DBUILD_SHARED_LIBS=ON",
"-DSDLNET_RELOCATABLE=ON",
"-DSDLNET_SAMPLES=OFF",
"-DSDLNET_INSTALL=ON",
"-DSDLNET_INSTALL_MAN=OFF"
Expand Down

0 comments on commit 644bf41

Please sign in to comment.