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

Find Raknet in deps

CI/before_script.msvc.sh

@@ -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; }

cmake/FindRakNet.cmake

@@ -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})