Skip to content

Commit befb45d

Browse files
wusatosiwusatosi
authored
Merge pull request #419 from bemanproject/river/bump-beman-submodule
Update beman submodule
2 parents d5f59d1 + da85e13 commit befb45d

4 files changed

Lines changed: 12 additions & 4 deletions

File tree

‎cookiecutter/{{cookiecutter.project_name}}/infra/.beman_submodule‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[beman_submodule]
22
remote=https://github.com/bemanproject/infra.git
3-
commit_hash=7b66b858d7f48428fca936184aef2bd246ccc81a
3+
commit_hash=7fc85e2e26cb491926ca2744c359c2aa7ea8fd27

‎cookiecutter/{{cookiecutter.project_name}}/infra/cmake/enable-experimental-import-std.cmake‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
2-
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0")
2+
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.4.0")
3+
set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
4+
"f35a9ac6-8463-4d38-8eec-5d6008153e7d"
5+
)
6+
elseif(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0")
37
set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
48
"451f2fe2-a8a2-47c3-bc32-94786d8fc91b"
59
)

‎infra/.beman_submodule‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[beman_submodule]
22
remote=https://github.com/bemanproject/infra.git
3-
commit_hash=7b66b858d7f48428fca936184aef2bd246ccc81a
3+
commit_hash=7fc85e2e26cb491926ca2744c359c2aa7ea8fd27

‎infra/cmake/enable-experimental-import-std.cmake‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
2-
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0")
2+
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.4.0")
3+
set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
4+
"f35a9ac6-8463-4d38-8eec-5d6008153e7d"
5+
)
6+
elseif(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0")
37
set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
48
"451f2fe2-a8a2-47c3-bc32-94786d8fc91b"
59
)

0 commit comments

Comments
 (0)