mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-13 03:51:42 +00:00
Code Issues Releases Wiki Activity

Merge pull request #17 from DreamWeave-MP/feature/find-raknet-in-deps

Browse source 
Find Raknet in deps
This commit is contained in:
Dave Corley 2023-08-06 05:52:16 -05:00 committed by GitHub
commit e9d7bb780d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
CI/before_script.msvc.sh
View file

@ -72,7 +72,6 @@ PDBS=""
PLATFORM=""
CONFIGURATIONS=()
TEST_FRAMEWORK=""
GOOGLE_INSTALL_ROOT=""
INSTALL_PREFIX="."
BUILD_BENCHMARKS=""
OSG_MULTIVIEW_BUILD=""
@ -1147,8 +1146,27 @@ fi
if [ -n "${TEST_FRAMEWORK}" ]; then
add_cmake_opts -DBUILD_UNITTESTS=ON
add_cmake_opts -DBUILD_OPENCS_TESTS=ON
# Saint Addition:
GOOGLETEST_DIR="${DEPS}/googletest"
add_cmake_opts -DGTEST_ROOT="${GOOGLETEST_DIR}/googletest"
add_cmake_opts -DGMOCK_ROOT="${GOOGLETEST_DIR}/googlemock"
add_cmake_opts -DGTEST_LIBRARY="${GOOGLETEST_DIR}/build/lib/Release/gtest.lib"
add_cmake_opts -DGTEST_MAIN_LIBRARY="${GOOGLETEST_DIR}/build/lib/Release//gtest_main.lib"
add_cmake_opts -DGMOCK_LIBRARY="${GOOGLETEST_DIR}/build/lib/Release/gmock.lib"
add_cmake_opts -DGMOCK_MAIN_LIBRARY="${GOOGLETEST_DIR}/build/lib/Release/gmock_main.lib"
add_cmake_opts -DGTEST_LIBRARY_DEBUG="${GOOGLETEST_DIR}/build/lib/Debug/gtest.lib"
add_cmake_opts -DGTEST_MAIN_LIBRARY_DEBUG="${GOOGLETEST_DIR}/build/lib/Debug/gtest_main.lib"
add_cmake_opts -DGMOCK_LIBRARY_DEBUG="${GOOGLETEST_DIR}/build/lib/Debug/gmock.lib"
add_cmake_opts -DGMOCK_MAIN_LIBRARY_DEBUG="${GOOGLETEST_DIR}/build/lib/Debug/gmock_main.lib"
fi
# Saint Addition:
# assume a symlink for googletest and raknet
RAKNET_ROOT="${DEPS}/raknet"
add_cmake_opts -DRAKNET_ROOT="$RAKNET_ROOT"
export RAKNET_ROOT
if [ -n "$ACTIVATE_MSVC" ]; then
echo -n "- Activating MSVC in the current shell... "
command -v vswhere >/dev/null 2>&1 || { echo "Error: vswhere is not on the path."; wrappedExit 1; }

7
cmake/FindRakNet.cmake
View file

@ -16,6 +16,8 @@ FIND_LIBRARY (RakNet_LIBRARY_RELEASE NAMES RakNetLibStatic
/usr/local/lib
/opt/local/lib
$ENV{RAKNET_ROOT}/lib
$ENV{RAKNET_ROOT}/build/lib/Release
${RAKNET_ROOT}/build/lib/Release
)
FIND_LIBRARY (RakNet_LIBRARY_DEBUG NAMES RakNetLibStaticd
@ -28,6 +30,8 @@ FIND_LIBRARY (RakNet_LIBRARY_DEBUG NAMES RakNetLibStaticd
/usr/local/lib
/opt/local/lib
$ENV{RAKNET_ROOT}/lib
$ENV{RAKNET_ROOT}/build/lib/Debug
${RAKNET_ROOT}/build/lib/Debug
)
@ -37,7 +41,8 @@ FIND_PATH (RakNet_INCLUDES raknet/RakPeer.h
/usr/include
/usr/local/include
/opt/local/include
$ENV{RAKNET_ROOT}/include
$ENV{RAKNET_ROOT}/include
${RAKNET_ROOT}/include
)
MESSAGE(STATUS ${RakNet_INCLUDES})