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.

Sign up for GitHub

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

Jump to bottom

CMake update grabbag #982

Merged
merged 2 commits into from
Sep 7, 2023
Merged

CMake update grabbag #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
791a8e4
CMake version updates
berquist May 26, 2023
5c2bcc7
CMake: isolate location where CMAKE_CXX_STANDARD is set
berquist Aug 23, 2023
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
19 changes: 13 additions & 6 deletions experimental/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,38 @@
cmake_minimum_required(VERSION 3.16)
project(
sst-core
VERSION 11.1.0
VERSION 13.0.0
DESCRIPTION "SSTCore"
LANGUAGES C CXX)

set(SST_TOP_SRC_DIR "${sst-core_SOURCE_DIR}/..")
include(cmake/PreventInSourceBuilds.cmake)

# cmake-lint: disable=C0103
set(_REQUIRED_CXX_STANDARD 17)
# cmake-lint: disable=C0301
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD ${_REQUIRED_CXX_STANDARD})
message(
STATUS "CMAKE_CXX_STANDARD was not set, defaulting the cmake standard to 17"
STATUS
"CMAKE_CXX_STANDARD was not set, defaulting the cmake standard to ${_REQUIRED_CXX_STANDARD}"
)
else()
if(CMAKE_CXX_STANDARD LESS 17)
message(FATAL_ERROR "We require the c++ standard to be at least 17")
if(CMAKE_CXX_STANDARD LESS ${_REQUIRED_CXX_STANDARD})
message(
FATAL_ERROR
"We require the c++ standard to be at least ${_REQUIRED_CXX_STANDARD}")
endif()
endif()
unset(_REQUIRED_CXX_STANDARD)

# ------------------------------------------------------------------------
# -- EXTERNAL CMAKE SCRIPTS
# ------------------------------------------------------------------------
# Don't change this path to SST_TOP_SRC_DIR cmake lives in experimental for now.
list(APPEND CMAKE_MODULE_PATH ${sst-core_SOURCE_DIR}/cmake)

find_package(Python 3.5 REQUIRED COMPONENTS Interpreter Development)
find_package(Python 3.6 REQUIRED COMPONENTS Interpreter Development)
find_package(Threads)

option(SST_DISABLE_ZLIB "Use zlib compression library" OFF)
Expand Down
2 changes: 0 additions & 2 deletions share/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
# distribution.
# ~~~

# TODO Remove this set set(prefix ${CMAKE_INSTALL_PREFIX})

message(
STATUS "SST: PREPROCESSING ${CMAKE_CURRENT_SOURCE_DIR}/SSTConfig.cmake.in")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/SSTConfig.cmake.in
Expand Down
Loading