Skip to content

Commit

Permalink
updated cpm, fortran-yaml-c, clima, forwarddiff, equilibrate
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicholaswogan committed Oct 25, 2024
1 parent cbffd4e commit beb22e6
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 19 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION "3.14")
cmake_policy(SET CMP0148 OLD)

project(Photochem LANGUAGES Fortran C VERSION "0.6.0")
project(Photochem LANGUAGES Fortran C VERSION "0.6.1")
set(PHOTOCHEM_CLIMA_DATA_VERSION "0.2.0")

include(FortranCInterface)
Expand Down
23 changes: 13 additions & 10 deletions cmake/CPM.cmake
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
set(CPM_DOWNLOAD_VERSION 0.34.3)
# SPDX-License-Identifier: MIT
#
# SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors

set(CPM_DOWNLOAD_VERSION 0.40.2)
set(CPM_HASH_SUM "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d")

if(CPM_SOURCE_CACHE)
# Expand relative path. This is important if the provided path contains a tilde (~)
get_filename_component(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE} ABSOLUTE)
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
elseif(DEFINED ENV{CPM_SOURCE_CACHE})
set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
else()
set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
endif()

if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
file(DOWNLOAD
https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
${CPM_DOWNLOAD_LOCATION}
)
endif()
# Expand relative path. This is important if the provided path contains a tilde (~)
get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)

file(DOWNLOAD
https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
${CPM_DOWNLOAD_LOCATION} EXPECTED_HASH SHA256=${CPM_HASH_SUM}
)

include(${CPM_DOWNLOAD_LOCATION})
16 changes: 8 additions & 8 deletions src/dependencies/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ CPMAddPackage(

CPMAddPackage(
NAME fortran-yaml-c
VERSION 0.2.4
VERSION 0.2.6
GITHUB_REPOSITORY "Nicholaswogan/fortran-yaml-c"
GIT_TAG "v0.2.4"
GIT_TAG "v0.2.6"
EXCLUDE_FROM_ALL ON
)

Expand Down Expand Up @@ -49,37 +49,37 @@ CPMAddPackage(

CPMAddPackage(
NAME clima
VERSION 0.5.2
VERSION 0.5.3
OPTIONS
"BUILD_EXECUTABLE OFF"
"BUILD_WITH_OPENMP ${BUILD_WITH_OPENMP}"
"SKBUILD ${SKBUILD}"
"BUILD_PYTHON_CLIMA ${BUILD_PYTHON_PHOTOCHEM}"
"PYTHON_CLIMA_DESTINATION photochem"
GITHUB_REPOSITORY "Nicholaswogan/clima"
GIT_TAG "v0.5.2"
GIT_TAG "v0.5.3"
EXCLUDE_FROM_ALL OFF
)

CPMAddPackage(
NAME forwarddiff
VERSION 0.1.2
VERSION 0.1.3
OPTIONS
"BUILD_EXECUTABLE OFF"
GITHUB_REPOSITORY "Nicholaswogan/forwarddiff"
GIT_TAG "v0.1.2"
GIT_TAG "v0.1.3"
EXCLUDE_FROM_ALL ON
)

CPMAddPackage(
NAME equilibrate
VERSION 0.1.8
VERSION 0.1.9
OPTIONS
"BUILD_EXECUTABLE OFF"
"SKBUILD ${SKBUILD}"
"BUILD_PYTHON_EQUILIBRATE ${BUILD_PYTHON_PHOTOCHEM}"
"PYTHON_EQUILIBRATE_DESTINATION photochem"
GITHUB_REPOSITORY "Nicholaswogan/Equilibrate"
GIT_TAG "v0.1.8"
GIT_TAG "v0.1.9"
EXCLUDE_FROM_ALL OFF
)

0 comments on commit beb22e6

Please sign in to comment.