Skip to content

Commit 644bf41

Browse files
committed
cmake: don't create relocatable packages by default with non-MSVC toolchains
1 parent 85eac24 commit 644bf41

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ cmake_dependent_option(BUILD_SHARED_LIBS "Build the library as a shared library"
7676

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

8182
option(SDLNET_SAMPLES "Build the SDL3_net sample program(s)" ${SDLNET_SAMPLES_DEFAULT})
@@ -233,9 +234,13 @@ if(SDLNET_INSTALL)
233234
COMPONENT devel
234235
)
235236

236-
file(RELATIVE_PATH SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG "${CMAKE_INSTALL_PREFIX}/${SDLNET_PKGCONFIG_INSTALLDIR}" "${CMAKE_INSTALL_PREFIX}")
237-
string(REGEX REPLACE "[/]+$" "" SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG "${SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG}")
238-
set(SDL_PKGCONFIG_PREFIX "\${pcfiledir}/${SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG}")
237+
if(SDLNET_RELOCATABLE)
238+
file(RELATIVE_PATH SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG "${CMAKE_INSTALL_PREFIX}/${SDLNET_PKGCONFIG_INSTALLDIR}" "${CMAKE_INSTALL_PREFIX}")
239+
string(REGEX REPLACE "[/]+$" "" SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG "${SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG}")
240+
set(SDL_PKGCONFIG_PREFIX "\${pcfiledir}/${SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG}")
241+
else()
242+
set(SDL_PKGCONFIG_PREFIX "${CMAKE_PREFIX_PATH}")
243+
endif()
239244

240245
string(JOIN " " PC_REQUIRES ${PC_REQUIRES})
241246
string(JOIN " " PC_LIBS ${PC_LIBS})

build-scripts/release-info.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"archs": ["x86", "x64"],
3636
"args": [
3737
"-DBUILD_SHARED_LIBS=ON",
38+
"-DSDLNET_RELOCATABLE=ON",
3839
"-DSDLNET_SAMPLES=OFF",
3940
"-DSDLNET_INSTALL=ON",
4041
"-DSDLNET_INSTALL_MAN=OFF"
@@ -87,6 +88,7 @@
8788
],
8889
"args": [
8990
"-DBUILD_SHARED_LIBS=ON",
91+
"-DSDLNET_RELOCATABLE=ON",
9092
"-DSDLNET_SAMPLES=OFF",
9193
"-DSDLNET_INSTALL=ON",
9294
"-DSDLNET_INSTALL_MAN=OFF"

0 commit comments

Comments
 (0)