immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1481 from colobot/dev-minor-fixes 

Some minor technical fixes
fix-squashed-planets
Mateusz Przybył 2021-12-15 17:59:54 +01:00 committed by GitHub
parent 9fd935770a ea7837b4c6
commit 17f68efb81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,6 +1,9 @@
[submodule "data"] [submodule "data"]
path = data path = data
url = git://github.com/colobot/colobot-data.git url = git://github.com/colobot/colobot-data.git
branch = .
update = rebase
[submodule "lib/googletest"] [submodule "lib/googletest"]
path = lib/googletest path = lib/googletest
url = git://github.com/google/googletest.git url = git://github.com/google/googletest.git
ignore = all

3
CMakeLists.txt
View File

@ -439,11 +439,12 @@ endif()
if(TESTS) if(TESTS)
# Google Test library # Google Test library
find_package(GTest 1.10.0 QUIET) find_package(GTest 1.11.0 QUIET)
if(NOT(FORCE_BUNDLED_GTEST) AND GTEST_FOUND) if(NOT(FORCE_BUNDLED_GTEST) AND GTEST_FOUND)
message(STATUS "Using system gtest library in ${GTEST_BOTH_LIBRARIES}") message(STATUS "Using system gtest library in ${GTEST_BOTH_LIBRARIES}")
elseif(EXISTS "${colobot_SOURCE_DIR}/lib/googletest/googletest/CMakeLists.txt") elseif(EXISTS "${colobot_SOURCE_DIR}/lib/googletest/googletest/CMakeLists.txt")
message(STATUS "Using gtest git submodule") message(STATUS "Using gtest git submodule")
set(GOOGLETEST_VERSION "1.11.0")
add_subdirectory("${colobot_SOURCE_DIR}/lib/googletest/googletest" "lib/googletest/googletest") add_subdirectory("${colobot_SOURCE_DIR}/lib/googletest/googletest" "lib/googletest/googletest")
# Add aliases so target names are compatible with the find_package above # Add aliases so target names are compatible with the find_package above
add_library(GTest::GTest ALIAS gtest) add_library(GTest::GTest ALIAS gtest)

3
cmake/FindSDL2.cmake
View File

@ -317,8 +317,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
if(SDL2MAIN_LIBRARY) if(SDL2MAIN_LIBRARY)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2main FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2main
REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR
VERSION_VAR SDL2_VERSION_STRING VERSION_VAR SDL2_VERSION_STRING)
NAME_MISMATCHED)
endif() endif()

2
data

@ -1 +1 @@
Subproject commit 21a45c0b8809accd142a83a81f1a3c92a327f319 Subproject commit 5d658744641064e56cf489453dbf726964b2b98d

2
lib/googletest

@ -1 +1 @@
Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e Subproject commit e2239ee6043f73722e7aa812a459f54a28552929