Fetch & build MathGeoLib.

CMakeLists.txt

@@ -244,12 +244,16 @@ message ("\n\n=========== Configuring Dependencies ===========\n")
 # The following CMake modules are required for the project to build.
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ENV_URHO3D_HOME}/Source/CMake/Modules cmake)
 include (Urho3D-CMake-common)
+include (ConfigurePackages)
 include (ModuleSetup)
 include (TundraInstall)
 
 # Find Urho3D library
 find_package (Urho3D REQUIRED)
 
+# Find/configure MathGeoLib
+configure_mathgeolib()
+
 # Set global hardcoded install prefix. User cannot change this at the moment, until we figure how we want to use this!
 # Call the cleanup step that cleans the install prefix before every installations. This is important as module setups might change between builds.
 set (CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR}/build)

cmake/ConfigurePackages.cmake

@@ -0,0 +1,13 @@
+# =============================================================================
+# Configuration macros for global dependencies.
+#
+# All global dependency configurations should go here.
+# All per-module dependency configurations should go in <Module>/CMakeLists.txt.
+
+macro(configure_mathgeolib)
+    set(MATHGEOLIB_DIR ${ENV_TUNDRA_DEP_PATH}/MathGeoLib)
+    set(MATHGEOLIB_INCLUDE_DIRS ${MATHGEOLIB_DIR}/build/include)
+    set(MATHGEOLIB_LIBRARY_DIRS ${MATHGEOLIB_DIR}/build/lib)
+    set(MATHGEOLIB_DEBUG_LIBRARIES MathGeoLib)
+    set(MATHGEOLIB_RELEASE_LIBRARIES MathGeoLib_d)
+endmacro (configure_mathgeolib)

src/Core/TundraCore/Application.cpp

@@ -5,5 +5,7 @@
 
 int TUNDRACORE_API run(int argc, char **argv)
 {
+	// Test code to demonstrate successful use of Urho3D and MathGeoLib. To be moved elsewhere/removed.
+
 	return 0;
 }

src/Core/TundraCore/CMakeLists.txt

@@ -12,8 +12,8 @@ file(GLOB H_FILES *.h)
 set(SOURCE_FILES ${CPP_FILES} ${H_FILES})
 
 UseTundraCore() # Include all subfolders within the project
-use_core_modules(Math)
-use_package(QJSON)
+use_package(Urho3D)
+use_package(MathGeoLib)
 
 add_definitions(-DTUNDRACORE_EXPORTS)
 
@@ -23,7 +23,8 @@ else()
     build_library(${TARGET_NAME} STATIC ${SOURCE_FILES})
 endif()
 
-# link_modules(Math)
+link_package(Urho3D)
+link_package(MathGeoLib)
 
 SetupCompileFlagsWithPCH()
 

tools/Windows/BuildDeps.cmd

@@ -33,7 +33,7 @@ IF NOT !BUILD_TYPE!==%BUILD_TYPE_MINSIZEREL% IF NOT !BUILD_TYPE!==%BUILD_TYPE_RE
     GOTO :EOF
 )
 :: DEBUG_OR_RELEASE and DEBUG_OR_RELEASE_LOWERCASE are "Debug" and "debug" for Debug build and "Release" and "release"
-:: for all of the Release variants. Lowercase version exists for Qt/nmake/jom.
+:: for all of the Release variants. 
 :: POSTFIX_D, POSTFIX_UNDERSCORE_D and POSTFIX_UNDERSCORE_DEBUG are helpers for performing file copies and checking
 :: for existence of files. In release build these variables are empty.
 set DEBUG_OR_RELEASE=Release
@@ -94,14 +94,37 @@ echo If you are not ready with the above, press Ctrl-C to abort!
 pause
 echo.
 
+:: MathGeoLib
+IF NOT EXIST "%DEPS%\MathGeoLib\". (
+    cecho {0D}Cloning MathGeoLib into "%DEPS%\MathGeoLib".{# #}{\n}
+    cd "%DEPS%"
+    git clone https://github.com/juj/MathGeoLib MathGeoLib
+    cd "%DEPS%\MathGeoLib\"
+    IF NOT EXIST "%DEPS%\MathGeoLib\.git" GOTO :ERROR
+)
+
+cecho {0D}Running CMake for MathGeoLib.{# #}{\n}
+cd "%DEPS%\MathGeoLib\"
+cmake . -G %GENERATOR% -DCMAKE_DEBUG_POSTFIX=_d -DCMAKE_INSTALL_PREFIX=%DEPS%\MathGeoLib\build
+IF NOT %ERRORLEVEL%==0 GOTO :ERROR
+
+cecho {0D}Building %BUILD_TYPE% MathGeoLib. Please be patient, this will take a while.{# #}{\n}
+MSBuild MathGeoLib.sln /p:configuration=%BUILD_TYPE% /clp:ErrorsOnly /nologo /m:%NUMBER_OF_PROCESSORS%
+IF NOT %ERRORLEVEL%==0 GOTO :ERROR
+
+:: Install the correct build type into MathGeoLib/build
+cecho {0D}Installing %BUILD_TYPE% MathGeoLib{# #}{\n}
+MSBuild INSTALL.%VCPROJ_FILE_EXT% /p:configuration=%BUILD_TYPE% /clp:ErrorsOnly /nologo /m:%NUMBER_OF_PROCESSORS%
+IF NOT %ERRORLEVEL%==0 GOTO :ERROR
+
+
 :: Urho3D engine
 :: latest master for now, if a "last known good version" is not needed
 IF NOT EXIST "%DEPS%\urho3d\". (
     cecho {0D}Cloning Urho3D into "%DEPS%\urho3d".{# #}{\n}
     cd "%DEPS%"
     git clone https://github.com/urho3d/Urho3D.git urho3d
     cd "%DEPS%\urho3d\"
-    git checkout 671d2c45ac75f69d2f073f8bf6f4dad8f517971b
     IF NOT EXIST "%DEPS%\urho3d\.git" GOTO :ERROR
 )