Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cmake warning #230

Merged
merged 3 commits into from
Jun 26, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -6,6 +6,11 @@ cmake_minimum_required(VERSION 3.3)
# From CMake 3, we can set the project version easily in one go
project(prmon VERSION 3.0.2)

# For newer CMakes we ensure correct handling of extracting GTest from tarball
if (POLICY CMP0135)
cmake_policy(SET CMP0135 NEW)
endif (POLICY CMP0135)

#--- Define basic build settings -----------------------------------------------
# - Use GNU-style hierarchy for installing build products
include(GNUInstallDirs)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -249,4 +249,4 @@ to CMake using `Gperftools_ROOT_DIR`.

# Copyright

Copyright (c) 2018-2022 CERN.
Copyright (c) 2018-2023 CERN.
2 changes: 1 addition & 1 deletion package/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
set_target_properties(mem-burner PROPERTIES COMPILE_FLAGS "-fno-builtin")
endif()

if (${CMAKE_VERSION} VERSION_GREATER "3.14.0" AND BUILD_GTESTS)
if (BUILD_GTESTS)

include(FetchContent)
FetchContent_Declare(
2 changes: 1 addition & 1 deletion submodules/nlohmann_json
Submodule nlohmann_json updated 1123 files
2 changes: 1 addition & 1 deletion submodules/spdlog
Submodule spdlog updated 103 files