diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-06-12 22:03:50 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-06-13 18:50:00 +0000 |
| commit | 6c56478ee1e15477b54d92bf25b7b4b1489bfcdb (patch) | |
| tree | 91152b2875100d99a00a8728a5dcc795740ed656 /test cases/cmake/1 basic | |
| parent | 3babaaaeecb01ceefb25508783207f1bf7876447 (diff) | |
| download | meson-6c56478ee1e15477b54d92bf25b7b4b1489bfcdb.zip meson-6c56478ee1e15477b54d92bf25b7b4b1489bfcdb.tar.gz meson-6c56478ee1e15477b54d92bf25b7b4b1489bfcdb.tar.bz2 | |
cmake: fix definitions with interface libraries (fixes #7299)
Diffstat (limited to 'test cases/cmake/1 basic')
| -rw-r--r-- | test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test cases/cmake/1 basic/subprojects/cmMod/cmMod.cpp | 4 | ||||
| -rw-r--r-- | test cases/cmake/1 basic/subprojects/cmMod/cmMod.hpp | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt index 9798209..9c95636 100644 --- a/test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt +++ b/test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt @@ -8,5 +8,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_definitions("-DDO_NOTHING_JUST_A_FLAG=1") add_library(cmModLib++ SHARED cmMod.cpp) +target_compile_definitions(cmModLib++ PRIVATE MESON_MAGIC_FLAG=21) +target_compile_definitions(cmModLib++ INTERFACE MESON_MAGIC_FLAG=42) include(GenerateExportHeader) generate_export_header(cmModLib++) diff --git a/test cases/cmake/1 basic/subprojects/cmMod/cmMod.cpp b/test cases/cmake/1 basic/subprojects/cmMod/cmMod.cpp index d3141d5..f4cbea0 100644 --- a/test cases/cmake/1 basic/subprojects/cmMod/cmMod.cpp +++ b/test cases/cmake/1 basic/subprojects/cmMod/cmMod.cpp @@ -2,6 +2,10 @@ using namespace std; +#if MESON_MAGIC_FLAG != 21 +#error "Invalid MESON_MAGIC_FLAG (private)" +#endif + cmModClass::cmModClass(string foo) { str = foo + " World"; } diff --git a/test cases/cmake/1 basic/subprojects/cmMod/cmMod.hpp b/test cases/cmake/1 basic/subprojects/cmMod/cmMod.hpp index 0e6dc04..4445e1f 100644 --- a/test cases/cmake/1 basic/subprojects/cmMod/cmMod.hpp +++ b/test cases/cmake/1 basic/subprojects/cmMod/cmMod.hpp @@ -3,6 +3,10 @@ #include "cmmodlib++_export.h" #include <string> +#if MESON_MAGIC_FLAG != 42 && MESON_MAGIC_FLAG != 21 +#error "Invalid MESON_MAGIC_FLAG" +#endif + class CMMODLIB___EXPORT cmModClass { private: std::string str; |