From 534e94ffc35dae3a0b2cc9f1e60e7e452872c512 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Thu, 26 Sep 2019 11:48:24 +0200 Subject: cmake: Support ALIAS libraries --- .../linuxlike/13 cmake dependency/cmake/FindImportedTarget.cmake | 4 +++- test cases/linuxlike/13 cmake dependency/meson.build | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'test cases/linuxlike') diff --git a/test cases/linuxlike/13 cmake dependency/cmake/FindImportedTarget.cmake b/test cases/linuxlike/13 cmake dependency/cmake/FindImportedTarget.cmake index d65c6fb00..753df5bc0 100644 --- a/test cases/linuxlike/13 cmake dependency/cmake/FindImportedTarget.cmake +++ b/test cases/linuxlike/13 cmake dependency/cmake/FindImportedTarget.cmake @@ -2,12 +2,14 @@ find_package(ZLIB) if(ZLIB_FOUND OR ZLIB_Found) set(ImportedTarget_FOUND ON) - add_library(mesonTestLibDefs UNKNOWN IMPORTED) + add_library(mesonTestLibDefs SHARED IMPORTED) set_property(TARGET mesonTestLibDefs PROPERTY IMPORTED_LOCATION ${ZLIB_LIBRARY}) set_property(TARGET mesonTestLibDefs PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIR}) set_property(TARGET mesonTestLibDefs APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS REQUIRED_MESON_FLAG1) set_property(TARGET mesonTestLibDefs APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS $<$>:QT_NO_DEBUG>) # Error empty string set_property(TARGET mesonTestLibDefs APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS REQUIRED_MESON_FLAG2) + set_target_properties(mesonTestLibDefs PROPERTIES IMPORTED_GLOBAL TRUE) + add_library(MesonTest::TestLibDefs ALIAS mesonTestLibDefs) else() set(ImportedTarget_FOUND OFF) endif() diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build index 411b7a36d..7d99764ce 100644 --- a/test cases/linuxlike/13 cmake dependency/meson.build +++ b/test cases/linuxlike/13 cmake dependency/meson.build @@ -48,9 +48,12 @@ depm3 = dependency('SomethingLikeZLIB', required : true, cmake_module_path : 'cm # Test some edge cases with spaces, etc. -testDep = dependency('ImportedTarget', required : true, method : 'cmake', cmake_module_path : 'cmake', modules: 'mesonTestLibDefs') -testFlagSet = executable('testFlagSet', ['testFlagSet.c'], dependencies: [testDep]) -test('testFlagSetTest', testFlagSet) +testDep1 = dependency('ImportedTarget', required : true, method : 'cmake', cmake_module_path : 'cmake', modules: 'mesonTestLibDefs') +testDep2 = dependency('ImportedTarget', required : true, method : 'cmake', cmake_module_path : 'cmake', modules : ['MesonTest::TestLibDefs']) +testFlagSet1 = executable('testFlagSet1', ['testFlagSet.c'], dependencies: [testDep1]) +testFlagSet2 = executable('testFlagSet2', ['testFlagSet.c'], dependencies: [testDep2]) +test('testFlagSetTest1', testFlagSet1) +test('testFlagSetTest2', testFlagSet2) # Try to compile a test that takes a dep and an include_directories -- cgit v1.2.3