Merge pull request #248 from kimkulling/improvement/update_deps_and_more

Improvement/update deps and more
kimkulling · Oct 16, 2024 · dae5ca7 · dae5ca7
2 parents 3c643ba + 003a7bd
commit dae5ca7
Show file tree

Hide file tree

Showing 278 changed files with 9 additions and 271,662 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -26,7 +26,7 @@ jobs:
       run: |
         sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
         sudo apt-get update -y -qq
-        sudo apt-get install libsdl2-dev libglm-dev libglew-dev
+        sudo apt-get install libsdl2-dev libglm-dev libglew-dev libgtest-dev
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,8 +7,7 @@ SET( OSRE_VERSION_MINOR 1 )
 SET( OSRE_VERSION_PATCH 0 )
 SET( OSRE_VERSION ${OSRE_VERSION_MAJOR}.${OSRE_VERSION_MINOR}.${OSRE_VERSION_PATCH} )
 SET( PROJECT_VERSION "${OSRE_VERSION}" )
-set_property( GLOBAL PROPERTY CXX_STANDARD 14 )
-#set(CMAKE_CXX_STANDARD 17 CACHE STRING "v")
+set(CMAKE_CXX_STANDARD 17)
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/contrib/assimp/cmake-modules/")
 
 OPTION( OSRE_BUILD_PLAYER "Build the plyer of OSRE." ON)

diff --git a/contrib/assimp b/contrib/assimp
diff --git a/contrib/cppcore b/contrib/cppcore
diff --git a/contrib/gmock-1.7.0/CHANGES b/contrib/gmock-1.7.0/CHANGES
diff --git a/contrib/gmock-1.7.0/CMakeLists.txt b/contrib/gmock-1.7.0/CMakeLists.txt
diff --git a/contrib/gmock-1.7.0/CONTRIBUTORS b/contrib/gmock-1.7.0/CONTRIBUTORS
diff --git a/contrib/gmock-1.7.0/LICENSE b/contrib/gmock-1.7.0/LICENSE