From e1a83793ae986db44bc810c36a8ea8090d81fe3f Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Thu, 31 Jan 2019 23:25:21 +0100 Subject: CMake: Added support for CMAKE_MODULE_PATH and extra CMake args (closes #4779) --- .../13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake | 9 +++++++++ test cases/linuxlike/13 cmake dependency/meson.build | 6 ++++++ 2 files changed, 15 insertions(+) create mode 100644 test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake (limited to 'test cases/linuxlike') diff --git a/test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake b/test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake new file mode 100644 index 000000000..a2f84565f --- /dev/null +++ b/test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake @@ -0,0 +1,9 @@ +find_package(ZLIB) + +if(ZLIB_FOUND OR ZLIB_Found) + set(SomethingLikeZLIB_FOUND ON) + set(SomethingLikeZLIB_LIBRARIES ${ZLIB_LIBRARY}) + set(SomethingLikeZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR}) +else() + set(SomethingLikeZLIB_FOUND OFF) +endif() diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build index 72773b29b..a18cd848a 100644 --- a/test cases/linuxlike/13 cmake dependency/meson.build +++ b/test cases/linuxlike/13 cmake dependency/meson.build @@ -36,6 +36,12 @@ depf2 = dependency('ZLIB', required : false, method : 'cmake', modules : 'dfggh: assert(depf2.found() == false, 'Invalid CMake targets should fail') +# Try to find a dependency with a custom CMake module + +depm1 = dependency('SomethingLikeZLIB', required : true, method : 'cmake', cmake_module_path : 'cmake') +depm2 = dependency('SomethingLikeZLIB', required : true, method : 'cmake', cmake_module_path : ['cmake']) +depm3 = dependency('SomethingLikeZLIB', required : true, cmake_module_path : 'cmake') + # Try to compile a test that takes a dep and an include_directories cc = meson.get_compiler('c') -- cgit v1.2.3