[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kmymoney] kmymoney/models: Improved CMakeLists.txt for models
From:       Christian_Dávid <null () kde ! org>
Date:       2017-12-03 21:48:16
Message-ID: E1eLc7U-0005Y5-TM () code ! kde ! org
[Download RAW message or body]

Git commit 37ea0cb9fd3aa0f6521b8e745c2c3ab288241e91 by Christian D=C3=A1vid.
Committed on 03/12/2017 at 21:45.
Pushed by christiand into branch 'master'.

Improved CMakeLists.txt for models

Removed duplicate code, improved readability.

M  +6    -18   kmymoney/models/CMakeLists.txt

https://commits.kde.org/kmymoney/37ea0cb9fd3aa0f6521b8e745c2c3ab288241e91

diff --git a/kmymoney/models/CMakeLists.txt b/kmymoney/models/CMakeLists.txt
index 0cd2627a..713e0b90 100644
--- a/kmymoney/models/CMakeLists.txt
+++ b/kmymoney/models/CMakeLists.txt
@@ -19,32 +19,20 @@ set(libmodels_a_SOURCES
     onlinejobmessagesmodel.cpp
     equitiesmodel.cpp
     securitiesmodel.cpp
+    $<$<BOOL:"${USE_MODELTEST}">:modeltest.cpp>
 )
 =

-if (USE_MODELTEST)
-  add_definitions( -DKMM_MODELTEST )
-  set(libmodels_a_SOURCES ${libmodels_a_SOURCES} modeltest.cpp)
-endif(USE_MODELTEST)
-
 add_library(models STATIC ${libmodels_a_SOURCES})
 =

-if (USE_MODELTEST)
-
-target_link_libraries(models LINK_PUBLIC
+target_link_libraries(models PUBLIC
     kmm_mymoney
     kmymoney_common
     KF5::ItemModels
-    Qt5::Test
 )
 =

-else(USE_MODELTEST)
-
-target_link_libraries(models LINK_PUBLIC
-    kmm_mymoney
-    kmymoney_common
-    KF5::ItemModels
-)
-
-endif(USE_MODELTEST)
+if (USE_MODELTEST)
+  target_compile_definitions(models PRIVATE -DKMM_MODELTEST)
+  target_link_libraries(models PRIVATE Qt5::Test)
+endif()
 =

 add_dependencies(models kmm_config)

[prev in list] [next in list] [prev in thread] [next in thread]