From 45c5300496486ff9f1f3d47a01cdf19b8fa7e877 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Sat, 27 Nov 2021 19:58:04 +0100 Subject: cmake: Fix old style dependency lookup with imported targets This also includes some refactoring, since the alternaticve would have been to duplicate the huge traceparser target code block again. fixes #9581 --- .../13 cmake dependency/cmake/FindImportedOldStyle.cmake | 5 +++++ test cases/linuxlike/13 cmake dependency/meson.build | 9 +++++++++ 2 files changed, 14 insertions(+) create mode 100644 test cases/linuxlike/13 cmake dependency/cmake/FindImportedOldStyle.cmake (limited to 'test cases/linuxlike') diff --git a/test cases/linuxlike/13 cmake dependency/cmake/FindImportedOldStyle.cmake b/test cases/linuxlike/13 cmake dependency/cmake/FindImportedOldStyle.cmake new file mode 100644 index 000000000..595b887e4 --- /dev/null +++ b/test cases/linuxlike/13 cmake dependency/cmake/FindImportedOldStyle.cmake @@ -0,0 +1,5 @@ +find_package(ZLIB) + +set(IMPORTEDOLDSTYLE_LIBRARIES ZLIB::ZLIB) +set(IMPORTEDOLDSTYLE_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}) +set(IMPORTEDOLDSTYLE_FOUND ON) diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build index 94d07d1c7..ae4cc425c 100644 --- a/test cases/linuxlike/13 cmake dependency/meson.build +++ b/test cases/linuxlike/13 cmake dependency/meson.build @@ -58,6 +58,15 @@ depm1 = dependency('SomethingLikeZLIB', required : true, components : 'required_ depm2 = dependency('SomethingLikeZLIB', required : true, components : 'required_comp', method : 'cmake', cmake_module_path : ['cmake']) depm3 = dependency('SomethingLikeZLIB', required : true, components : ['required_comp'], cmake_module_path : 'cmake') + +# Mix of imported targets and old style variables + +depio1 = dependency('ImportedOldStyle', required : true, cmake_module_path : 'cmake') + +# Try to actually link with depio1, since we are doing even more "fun" stuff there +exe4 = executable('zlibprog4', 'prog.c', dependencies : depio1) +test('zlibtest4', exe4) + # Test some edge cases with spaces, etc. (but only for CMake >= 3.15) if cm_vers.version_compare('>=3.15') -- cgit v1.2.3