diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-01-15 16:01:40 +0100 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-01-23 20:57:17 +0100 |
commit | bc27ebacc92fe0bc69bf6763533aca70850db02e (patch) | |
tree | 5aaaa61352440ed71b14620e87e30c8ba1daa00a /test cases | |
parent | a11a28a98849e857c60a35e5cdecfc3a6ee49105 (diff) | |
download | meson-bc27ebacc92fe0bc69bf6763533aca70850db02e.zip meson-bc27ebacc92fe0bc69bf6763533aca70850db02e.tar.gz meson-bc27ebacc92fe0bc69bf6763533aca70850db02e.tar.bz2 |
cmake: Always Add C, CXX if no language is specified (fixes #6441)
Diffstat (limited to 'test cases')
-rw-r--r-- | test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake | 37 | ||||
-rw-r--r-- | test cases/linuxlike/13 cmake dependency/meson.build | 2 |
2 files changed, 38 insertions, 1 deletions
diff --git a/test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake b/test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake index 9e68ac6..4f12706 100644 --- a/test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake +++ b/test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake @@ -1,6 +1,43 @@ find_package(ZLIB) include(CMakeFindDependencyMacro) +include(CheckCXXSourceRuns) +include(CheckCSourceRuns) + +check_cxx_source_runs( +" +#include <iostream> + +using namespace std; + +int main(void) { + cout << \"Hello World\" << endl; + return 0; +} +" +CXX_CODE_RAN +) + +check_c_source_runs( +" +#include <stdio.h> + +int main(void) { + printf(\"Hello World\"); + return 0; +} +" +C_CODE_RAN +) + +if(NOT CXX_CODE_RAN) + message(FATAL_ERROR "Running CXX source code failed") +endif() + +if(NOT C_CODE_RAN) + message(FATAL_ERROR "Running C source code failed") +endif() + find_dependency(Threads) if(ZLIB_FOUND OR ZLIB_Found) diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build index 7753550..a76b327 100644 --- a/test cases/linuxlike/13 cmake dependency/meson.build +++ b/test cases/linuxlike/13 cmake dependency/meson.build @@ -1,6 +1,6 @@ # this test can ONLY be run successfully from run_project_test.py # due to use of setup_env.json -project('external CMake dependency', 'c') +project('external CMake dependency', ['c', 'cpp']) if not find_program('cmake', required: false).found() error('MESON_SKIP_TEST cmake binary not available.') |