diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-12-09 23:13:01 +0100 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-12-12 20:14:26 -0500 |
| commit | ebf5757c59d9bceb953dc531c757e07dcf83c081 (patch) | |
| tree | b8456264dfb8f3a75f476343d0bd6a398677ccec /test cases/cmake | |
| parent | f6f46173c48196f99f1daaf21affba0f44aef962 (diff) | |
| download | meson-ebf5757c59d9bceb953dc531c757e07dcf83c081.tar.gz | |
cmake: parse project version
This properly sets the project version in projects meson generates from
cmake projects. This allows dependency fallbacks to properly check the
version constraints in dependency calls when falling back to a cmake
subproject. Before this would fail, because the project version was
undefined.
Diffstat (limited to 'test cases/cmake')
| -rw-r--r-- | test cases/cmake/27 dependency fallback/meson.build | 2 | ||||
| -rw-r--r-- | test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test cases/cmake/27 dependency fallback/meson.build b/test cases/cmake/27 dependency fallback/meson.build index 871d70c9f..76230bbf6 100644 --- a/test cases/cmake/27 dependency fallback/meson.build +++ b/test cases/cmake/27 dependency fallback/meson.build @@ -1,7 +1,7 @@ project('cmakeSubTest', ['c', 'cpp']) # Fallback to a CMake subproject -sub_dep = dependency('cmModLib++') +sub_dep = dependency('cmModLib++', version: '>=1.2.3') exe1 = executable('main', ['main.cpp'], dependencies: [sub_dep]) test('test1', exe1) diff --git a/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt index d08e55cdf..f920576e2 100644 --- a/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt +++ b/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -project(cmMod) +project(cmMod VERSION 1.2.3) set(CMAKE_CXX_STANDARD 14) include_directories(${CMAKE_CURRENT_BINARY_DIR}) |