Skip to content

Commit 2a8725d

Browse files
authored
Merge pull request #275 from bemanproject/274-exemplar-various-updates-cmake-etc
#274 - small tweaks in cmake
2 parents 2fd62a5 + 8a1e4fe commit 2a8725d

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
22

3-
cmake_minimum_required(VERSION 3.25)
3+
cmake_minimum_required(VERSION 3.28...4.2)
44

55
project(
66
beman.exemplar # CMake Project Name, which is also the name of the top-level
77
# targets (e.g., library, executable, etc.).
88
DESCRIPTION "A Beman Library Exemplar"
99
LANGUAGES CXX
10-
VERSION 2.2.1
10+
VERSION 0.1.0
1111
)
1212

1313
# [CMAKE.SKIP_TESTS]
@@ -24,11 +24,13 @@ option(
2424
${PROJECT_IS_TOP_LEVEL}
2525
)
2626

27-
include(CTest)
27+
# for find of beman-install-library
28+
include(infra/cmake/beman-install-library-config.cmake)
2829

2930
add_subdirectory(src/beman/exemplar)
3031

3132
if(BEMAN_EXEMPLAR_BUILD_TESTS)
33+
enable_testing()
3234
add_subdirectory(tests/beman/exemplar)
3335
endif()
3436

cookiecutter/{{cookiecutter.project_name}}/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
22

3-
cmake_minimum_required(VERSION 3.25)
3+
cmake_minimum_required(VERSION 3.28...4.2)
44

55
project(
66
beman.{{cookiecutter.project_name}} # CMake Project Name, which is also the name of the top-level
77
# targets (e.g., library, executable, etc.).
88
DESCRIPTION "{{cookiecutter.description}}"
99
LANGUAGES CXX
10-
VERSION 2.2.1
10+
VERSION 0.1.0
1111
)
1212

1313
# [CMAKE.SKIP_TESTS]
@@ -24,11 +24,13 @@ option(
2424
${PROJECT_IS_TOP_LEVEL}
2525
)
2626

27-
include(CTest)
27+
# for find of beman-install-library
28+
include(infra/cmake/beman-install-library-config.cmake)
2829

2930
add_subdirectory(src/beman/{{cookiecutter.project_name}})
3031

3132
if(BEMAN_{{cookiecutter.project_name.upper()}}_BUILD_TESTS)
33+
enable_testing()
3234
add_subdirectory(tests/beman/{{cookiecutter.project_name}})
3335
endif()
3436

0 commit comments

Comments
 (0)