diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-03-05 19:21:15 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-03-08 14:10:22 +0200 |
| commit | 91976a3489acbe53593e866fdb11951b515fda54 (patch) | |
| tree | 23249112cd4a5f4f555ae6173956e04c90b7f020 /test cases/cmake | |
| parent | 7234316dc7784667443d358b0d2c3e2ff561b474 (diff) | |
| download | meson-91976a3489acbe53593e866fdb11951b515fda54.zip meson-91976a3489acbe53593e866fdb11951b515fda54.tar.gz meson-91976a3489acbe53593e866fdb11951b515fda54.tar.bz2 | |
cmake: Fix build_by_default: false, install: true (fixes #6737)
Diffstat (limited to 'test cases/cmake')
| -rw-r--r-- | test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test cases/cmake/3 advanced no dep/test.json | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt index 38c1fff..4c782cb 100644 --- a/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt +++ b/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt @@ -16,9 +16,11 @@ generate_export_header(cmModLib) set_target_properties(cmModLib PROPERTIES VERSION 1.0.1) add_executable(testEXE main.cpp) +add_executable(testEXE2 main.cpp) target_link_libraries(testEXE cmModLib) +target_link_libraries(testEXE2 cmModLib) target_compile_definitions(cmModLibStatic PUBLIC CMMODLIB_STATIC_DEFINE) -install(TARGETS cmModLib testEXE LIBRARY DESTINATION lib RUNTIME DESTINATION bin) +install(TARGETS cmModLib testEXE testEXE2 LIBRARY DESTINATION lib RUNTIME DESTINATION bin) diff --git a/test cases/cmake/3 advanced no dep/test.json b/test cases/cmake/3 advanced no dep/test.json index 3b8b12d..24c89c4 100644 --- a/test cases/cmake/3 advanced no dep/test.json +++ b/test cases/cmake/3 advanced no dep/test.json @@ -5,6 +5,8 @@ {"type": "implib", "platform": "!cygwin", "file": "usr/bin/libcm_cmModLib"}, {"type": "pdb", "file": "usr/bin/cm_cmModLib"}, {"type": "pdb", "file": "usr/bin/cm_testEXE"}, - {"type": "exe", "file": "usr/bin/cm_testEXE"} + {"type": "exe", "file": "usr/bin/cm_testEXE"}, + {"type": "pdb", "file": "usr/bin/cm_testEXE2"}, + {"type": "exe", "file": "usr/bin/cm_testEXE2"} ] } |