thelilfrog/maddy
1
0
Fork 0
mirror of https://github.com/progsource/maddy.git synced 2026-03-25 07:50:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: move gtest into cmake and up cmake min version

Browse Source 
cmake minimum required version is now 3.25.

Instead of loading gtest via git submodule, it is now loaded
in the cmake files.

gtest version upped to v1.13.0.
This commit is contained in:
Petra Baranski
2023-07-23 05:36:57 +02:00
parent f3d934d6ec
commit 6dd47f5de5
5 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -1,3 +0,0 @@
[submodule "libs/gtest"]
path = libs/gtest
url = https://github.com/google/googletest.git

2
CHANGELOG.md
View File

@@ -16,6 +16,8 @@ maddy uses [semver versioning](https://semver.org/).
* ![**ADDED**](https://img.shields.io/badge/-ADDED-%23099) Added Changelog * ![**ADDED**](https://img.shields.io/badge/-ADDED-%23099) Added Changelog
* ![**ADDED**](https://img.shields.io/badge/-ADDED-%23099) Added contribution guideline * ![**ADDED**](https://img.shields.io/badge/-ADDED-%23099) Added contribution guideline
* ![**CHANGED**](https://img.shields.io/badge/-CHANGED-%23e90) updated cmake minimum required version to 3.25
* ![**CHANGED**](https://img.shields.io/badge/-CHANGED-%23e90) gtest is now loaded via cmake and not a git submodule any longer - updated gtest version to 1.13.0
* ? * ?
## version 1.1.2 2020-10-04 ## version 1.1.2 2020-10-04

4
CMakeLists.txt
View File

@@ -1,7 +1,7 @@
# This project is licensed under the MIT license. For more information see the # This project is licensed under the MIT license. For more information see the
# LICENSE file. # LICENSE file.
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 3.25)
project(maddy) project(maddy)
@@ -54,8 +54,6 @@ endif()
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/gtest/googlemock)
add_subdirectory(libs) add_subdirectory(libs)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

17
libs/CMakeLists.txt
View File

@@ -1,14 +1,11 @@
# This project is licensed under the MIT license. For more information see the # This project is licensed under the MIT license. For more information see the
# LICENSE file. # LICENSE file.
cmake_minimum_required(VERSION 2.8) include(FetchContent)
set(LIBS_INCLUDE_DIRS FetchContent_Declare(
# -- googletest / -mock -------------------------------------------------------- googletest
${CMAKE_CURRENT_SOURCE_DIR}/gtest/googletest/include GIT_REPOSITORY https://github.com/google/googletest.git
${CMAKE_CURRENT_SOURCE_DIR}/gtest/googlemock/include GIT_TAG b796f7d44681514f58a683a3a71ff17c94edb0c1 # v1.13.0
# ------------------------------------------------------------------------------ )
PARENT_SCOPE) FetchContent_MakeAvailable(googletest)
set(LIBS_SRC_FILES
PARENT_SCOPE)

1
libs/gtest

Submodule libs/gtest deleted from 703bd9caab