admin/CSFML
1
0 Fork 0
mirror of https://github.com/SFML/CSFML.git synced 2026-10-26 05:06:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use SFML_ROOT to find SFML installation

Browse Source 
This is line with modern CMake convention where -D<PackageName>_ROOT
is used to locate a given package's installation.

https://cmake.org/cmake/help/latest/variable/PackageName_ROOT.html#variable:%3CPackageName%3E_ROOT
This commit is contained in:
Chris Thrasher committed 2024-09-02 21:03:54 -06:00
1 parent f9e67732e2
commit 6035a5fa5a
6 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/ci.yml
+2 -2
View File
@@ -61,7 +61,7 @@ jobs:
path: CSFML
- name: Configure CSFML CMake
run: cmake --preset dev -S CSFML -B CSFML/build -DCMAKE_INSTALL_PREFIX=CSFML/install -DCSFML_LINK_SFML_STATICALLY=FALSE -DSFML_DIR=$GITHUB_WORKSPACE/SFML/install/lib/cmake/SFML -DCMAKE_VERBOSE_MAKEFILE=ON ${{matrix.platform.flags}} -DCMAKE_BUILD_TYPE=${{matrix.type.name}}
run: cmake --preset dev -S CSFML -B CSFML/build -DCMAKE_INSTALL_PREFIX=CSFML/install -DCSFML_LINK_SFML_STATICALLY=FALSE -DSFML_ROOT=SFML/install -DCMAKE_VERBOSE_MAKEFILE=ON ${{matrix.platform.flags}} -DCMAKE_BUILD_TYPE=${{matrix.type.name}}
- name: Build CSFML
run: cmake --build CSFML/build --config ${{matrix.type.name}} --target install
@@ -113,7 +113,7 @@ jobs:
path: CSFML
- name: Configure CSFML CMake
run: cmake --preset dev -S CSFML -B CSFML/build -DSFML_DIR=$GITHUB_WORKSPACE/SFML/install/lib/cmake/SFML -DCMAKE_BUILD_TYPE=Debug
run: cmake --preset dev -S CSFML -B CSFML/build -DSFML_ROOT=SFML/install -DCMAKE_BUILD_TYPE=Debug
- name: Tidy
run: cmake --build CSFML/build --target tidy
readme.md
+1 -1
View File
@@ -27,7 +27,7 @@ Of course, you can also find the CSFML API documentation in the SDK.
## Building
Set `SFML_DIR` to a directory containing the `SFMLConfig.cmake` file, usually located at `lib/cmake/SFML`.
Set `SFML_ROOT` to a directory containing the installation of SFML.
## Contribute
tools/BuildMacOS.sh
+1 -1
View File
@@ -371,7 +371,7 @@ build_csfml () # $1: 'clang' => clang & libc++
-D "CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$target" \
-D "CMAKE_OSX_SYSROOT:STRING=$sdk" \
-D "BUILD_DOC:BOOL=$doc" \
-D "SFML_DIR:PATH=$sfml_package1070/Frameworks/SFML.framework/Versions/$gittag/Resources/CMake" \
-D "SFML_ROOT:PATH=$sfml_package1070/Frameworks/SFML.framework/Versions/$gittag/Resources/CMake" \
"$codedir"
assert $? "CMake failed"
tools/nuget/build.linux.sh
+1 -1
View File
@@ -113,7 +113,7 @@ CSFMLLibDir="$(realpath lib)" # The directory that contains the final CSFML libr
cmake -E env LDFLAGS="-z origin" \
cmake \
"-DSFML_DIR=$SFMLBuiltDir" \
"-DSFML_ROOT=$SFMLBuiltDir" \
'-DBUILD_SHARED_LIBS=1' \
'-DCMAKE_BUILD_TYPE=Release' \
"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$CSFMLLibDir" \
tools/nuget/build.macos.sh
+1 -1
View File
@@ -133,7 +133,7 @@ CSFMLLibDir="$(realpath lib)" # The directory that contains the final CSFML libr
cmake -E env \
cmake -G "Unix Makefiles" \
-D "SFML_DIR=$SFMLBuiltDir" \
-D "SFML_ROOT=$SFMLBuiltDir" \
-D 'BUILD_SHARED_LIBS=ON' \
-D 'CMAKE_BUILD_TYPE=Release' \
-D "CMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" \
tools/nuget/build.win.ps1
+1 -1
View File
@@ -141,7 +141,7 @@ New-Item -ItemType Directory lib > $null
$CSFMLLibDir = (Get-Item lib).FullName; # The directory where the final CSFML dlls are located
cmake `
"-DSFML_DIR=$SFMLBuiltDir" `
"-DSFML_ROOT=$SFMLBuiltDir" `
'-DCSFML_LINK_SFML_STATICALLY=1' `
"-DCMAKE_LIBRARY_PATH=$SFMLExtLibs" `
`