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

List:       kde-commits
Subject:    [skrooge] /: Better performance of build
From:       Stephane MANKOWSKI <null () kde ! org>
Date:       2018-02-28 22:19:09
Message-ID: E1erA45-0004Ht-QN () code ! kde ! org
[Download RAW message or body]

Git commit d0b98bf4324d81e1d2f657d6a6632bf9aadc72b8 by Stephane MANKOWSKI.
Committed on 28/02/2018 at 22:19.
Pushed by smankowski into branch 'master'.

Better performance of build

M  +11   -9    skgbankgui/CMakeLists.txt
M  +14   -15   skgbasegui/CMakeLists.txt

https://commits.kde.org/skrooge/d0b98bf4324d81e1d2f657d6a6632bf9aadc72b8

diff --git a/skgbankgui/CMakeLists.txt b/skgbankgui/CMakeLists.txt
index 8bfcda047..4003ca456 100644
--- a/skgbankgui/CMakeLists.txt
+++ b/skgbankgui/CMakeLists.txt
@@ -28,7 +28,8 @@ SET(skgbankgui_SRCS
    skgunitcombobox.cpp
  )
 IF(SKG_DESIGNER)
-  SET(skgbankgui_designer_SRCS
+  SET(skgbankgui_SRCS
+    ${skgbankgui_SRCS}
     skgquerycreatordesignerplugin.cpp
     skgbkwidgetcollectiondesignerplugin.cpp
     skgpredicatcreatordesignerplugin.cpp
@@ -38,24 +39,25 @@ ENDIF(SKG_DESIGNER)
 ki18n_wrap_ui(skgbankgui_SRCS skgquerycreator.ui)
 
 ADD_LIBRARY(skgbankgui SHARED ${skgbankgui_SRCS})
-TARGET_LINK_LIBRARIES(skgbankgui LINK_PUBLIC Qt5::Xml skgbankmodeler skgbasemodeler \
                skgbasegui)
-SET_TARGET_PROPERTIES( skgbankgui PROPERTIES VERSION ${SKG_VERSION} SOVERSION \
                ${SOVERSION} )
-
 IF(SKG_DESIGNER)
-  ADD_LIBRARY(skgbankguidesigner SHARED ${skgbankgui_designer_SRCS})
-  TARGET_LINK_LIBRARIES(skgbankguidesigner LINK_PUBLIC Qt5::Xml Qt5::Designer \
skgbankmodeler skgbasemodeler skgbasegui skgbankgui) +  \
TARGET_LINK_LIBRARIES(skgbankgui LINK_PUBLIC Qt5::Xml skgbankmodeler skgbasemodeler \
skgbasegui Qt5::Designer) +ELSE(SKG_DESIGNER)
+  TARGET_LINK_LIBRARIES(skgbankgui LINK_PUBLIC Qt5::Xml skgbankmodeler \
skgbasemodeler skgbasegui)  ENDIF(SKG_DESIGNER)
+SET_TARGET_PROPERTIES( skgbankgui PROPERTIES VERSION ${SKG_VERSION} SOVERSION \
${SOVERSION} )  
 GENERATE_EXPORT_HEADER(skgbankgui BASE_NAME skgbankgui)
 
 ########### install files ###############
-INSTALL(TARGETS skgbankgui ${INSTALL_TARGETS_DEFAULT_ARGS}  LIBRARY NAMELINK_SKIP  )
+
 IF(SKG_DESIGNER)
   IF(WIN32)
-    INSTALL(TARGETS skgbankguidesigner LIBRARY ARCHIVE DESTINATION \
${PLUGIN_INSTALL_DIR}/designer ) +    INSTALL(TARGETS skgbankgui LIBRARY ARCHIVE \
DESTINATION ${PLUGIN_INSTALL_DIR}/designer )  ELSE(WIN32)
-    INSTALL(TARGETS skgbankguidesigner LIBRARY DESTINATION \
${PLUGIN_INSTALL_DIR}/designer ) +    INSTALL(TARGETS skgbankgui LIBRARY DESTINATION \
${PLUGIN_INSTALL_DIR}/designer )  ENDIF(WIN32)
+ELSE(SKG_DESIGNER)
+    INSTALL(TARGETS skgbankgui ${INSTALL_TARGETS_DEFAULT_ARGS}  LIBRARY \
NAMELINK_SKIP  )  ENDIF(SKG_DESIGNER)  
 
 INSTALL(DIRECTORY icons_breeze/ DESTINATION ${ICON_INSTALL_DIR}/breeze/actions/22 \
                FILES_MATCHING PATTERN "*.svgz")
diff --git a/skgbasegui/CMakeLists.txt b/skgbasegui/CMakeLists.txt
index a677424a7..5fb3e1f90 100644
--- a/skgbasegui/CMakeLists.txt
+++ b/skgbasegui/CMakeLists.txt
@@ -65,7 +65,8 @@ SET(skgbasegui_SRCS
    skgsimpleperiodedit.cpp
  )
 IF(SKG_DESIGNER) 
-  SET(skgbasegui_designer_SRCS
+  SET(skgbasegui_SRCS
+    ${skgbasegui_SRCS}
     skgwidgetcollectiondesignerplugin.cpp
     skgtabwidgetdesignerplugin.cpp
     skgtablewidgetdesignerplugin.cpp
@@ -93,38 +94,36 @@ ki18n_wrap_ui(skgbasegui_SRCS skgmainpanel_base.ui \
skgmainpanel_pref.ui skggraph  kconfig_add_kcfg_files(skgbasegui_SRCS \
skgbasegui_settings.kcfgc )  
 ADD_LIBRARY(skgbasegui SHARED ${skgbasegui_SRCS})
-IF(SKG_DESIGNER)
-  ADD_LIBRARY(skgbaseguidesigner SHARED ${skgbasegui_SRCS} \
                ${skgbasegui_designer_SRCS})
-ENDIF(SKG_DESIGNER)
 
 if (KActivities_FOUND)
     MESSAGE( STATUS "     KActivity FOUND" )
     TARGET_LINK_LIBRARIES(skgbasegui LINK_PUBLIC KF5::Activities)
 endif (KActivities_FOUND)
 
-IF(SKG_WEBENGINE)
-    TARGET_LINK_LIBRARIES(skgbasegui LINK_PUBLIC KF5::Parts KF5::KIOFileWidgets \
KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets Qt5::PrintSupport Qt5::Svg \
                Qt5::WebEngineWidgets skgbasemodeler)
-ELSE(SKG_WEBENGINE)
-    TARGET_LINK_LIBRARIES(skgbasegui LINK_PUBLIC KF5::Parts KF5::KIOFileWidgets \
KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets Qt5::PrintSupport Qt5::Svg \
                Qt5::WebKitWidgets skgbasemodeler)
-ENDIF(SKG_WEBENGINE)
-SET_TARGET_PROPERTIES(skgbasegui PROPERTIES VERSION ${SKG_VERSION} SOVERSION \
                ${SOVERSION} )
-
 IF(SKG_DESIGNER)
     IF(SKG_WEBENGINE)
-        TARGET_LINK_LIBRARIES(skgbaseguidesigner LINK_PUBLIC KF5::Parts \
KF5::KIOFileWidgets KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets \
Qt5::PrintSupport Qt5::Svg Qt5::WebEngineWidgets Qt5::Designer skgbasemodeler) +      \
TARGET_LINK_LIBRARIES(skgbasegui LINK_PUBLIC KF5::Parts KF5::KIOFileWidgets \
KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets Qt5::PrintSupport Qt5::Svg \
Qt5::WebEngineWidgets skgbasemodeler Qt5::Designer)  ELSE(SKG_WEBENGINE)
-        TARGET_LINK_LIBRARIES(skgbaseguidesigner LINK_PUBLIC KF5::Parts \
KF5::KIOFileWidgets KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets \
Qt5::PrintSupport Qt5::Svg Qt5::WebKitWidgets Qt5::Designer skgbasemodeler) +        \
TARGET_LINK_LIBRARIES(skgbasegui LINK_PUBLIC KF5::Parts KF5::KIOFileWidgets \
KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets Qt5::PrintSupport Qt5::Svg \
Qt5::WebKitWidgets skgbasemodeler Qt5::Designer) +    ENDIF(SKG_WEBENGINE)
+ELSE(SKG_DESIGNER)
+    IF(SKG_WEBENGINE)
+        TARGET_LINK_LIBRARIES(skgbasegui LINK_PUBLIC KF5::Parts KF5::KIOFileWidgets \
KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets Qt5::PrintSupport Qt5::Svg \
Qt5::WebEngineWidgets skgbasemodeler) +    ELSE(SKG_WEBENGINE)
+        TARGET_LINK_LIBRARIES(skgbasegui LINK_PUBLIC KF5::Parts KF5::KIOFileWidgets \
KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets Qt5::PrintSupport Qt5::Svg \
Qt5::WebKitWidgets skgbasemodeler)  ENDIF(SKG_WEBENGINE)
 ENDIF(SKG_DESIGNER)
+SET_TARGET_PROPERTIES(skgbasegui PROPERTIES VERSION ${SKG_VERSION} SOVERSION \
${SOVERSION} ) +
 GENERATE_EXPORT_HEADER(skgbasegui BASE_NAME skgbasegui)
 
 ########### install files ###############
 INSTALL(TARGETS skgbasegui ${INSTALL_TARGETS_DEFAULT_ARGS}  LIBRARY NAMELINK_SKIP  )
 IF(SKG_DESIGNER)
   IF(WIN32)
-    INSTALL(TARGETS skgbaseguidesigner LIBRARY ARCHIVE DESTINATION \
${PLUGIN_INSTALL_DIR}/designer ) +    INSTALL(TARGETS skgbasegui LIBRARY ARCHIVE \
DESTINATION ${PLUGIN_INSTALL_DIR}/designer )  ELSE(WIN32)
-    INSTALL(TARGETS skgbaseguidesigner LIBRARY DESTINATION \
${PLUGIN_INSTALL_DIR}/designer ) +    INSTALL(TARGETS skgbasegui LIBRARY DESTINATION \
${PLUGIN_INSTALL_DIR}/designer )  ENDIF(WIN32)
 ENDIF(SKG_DESIGNER)  
 


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