From 91976a3489acbe53593e866fdb11951b515fda54 Mon Sep 17 00:00:00 2001
From: Daniel Mensinger <daniel@mensinger-ka.de>
Date: Thu, 5 Mar 2020 19:21:15 +0100
Subject: [PATCH] cmake: Fix build_by_default: false, install: true (fixes
 #6737)

---
 mesonbuild/cmake/interpreter.py                               | 2 +-
 .../cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt  | 4 +++-
 test cases/cmake/3 advanced no dep/test.json                  | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py
index efdb840b6..dcb9e2517 100644
--- a/mesonbuild/cmake/interpreter.py
+++ b/mesonbuild/cmake/interpreter.py
@@ -1124,7 +1124,7 @@ class CMakeInterpreter:
 
             # Generate target kwargs
             tgt_kwargs = {
-                'build_by_default': False,
+                'build_by_default': tgt.install,
                 'link_args': tgt.link_flags + tgt.link_libraries,
                 'link_with': link_with,
                 'include_directories': id_node(inc_var),
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 38c1fff1a..4c782cb38 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 3b8b12d85..24c89c4ed 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"}
   ]
 }