review object targets build rules

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b1dfa1..a72359f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -578,10 +578,7 @@ if(NOT X11_SM_FOUND)
 endif()
 
 # semi-shared
-include(src/shared/linguist/linguist.cmake)
-include(src/shared/qtgradienteditor/qtgradienteditor.cmake)
-include(src/shared/qtpropertybrowser/qtpropertybrowser.cmake)
-include(src/shared/findwidget/findwidget.cmake)
+add_subdirectory(src/shared)
 
 # major components
 add_subdirectory(src/core)

diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake
index d45dece..8ceda5f 100644 (file)
--- a/cmake/modules/KatieBuildMacros.cmake
+++ b/cmake/modules/KatieBuildMacros.cmake
@@ -233,16 +233,27 @@ endfunction()
 
 # a macro to ensure that object targets are build with PIC if the target they
 # are going to be used in (like $<TARGET_OBJECTS:foo>) is build with PIC or
-# PIC has been enabled for all module/library/executable targets
+# PIC has been enabled for all module/library/executable targets. in addition
+# the macro will add the object include directories and definitions to the
+# target properties
 macro(KATIE_SETUP_OBJECT FORTARGET)
-    get_target_property(targets_pic ${FORTARGET} POSITION_INDEPENDENT_CODE)
-    if(CMAKE_POSITION_INDEPENDENT_CODE OR targets_pic)
+    get_target_property(target_pic ${FORTARGET} POSITION_INDEPENDENT_CODE)
+    if(CMAKE_POSITION_INDEPENDENT_CODE OR target_pic)
         foreach(objtarget ${ARGN})
             set_target_properties(${objtarget} PROPERTIES
                 POSITION_INDEPENDENT_CODE TRUE
             )
         endforeach()
     endif()
+
+    foreach(objtarget ${ARGN})
+        get_target_property(object_definitions ${objtarget} COMPILE_DEFINITIONS)
+        get_target_property(object_includes ${objtarget} INCLUDE_DIRECTORIES)
+        if(object_definitions)
+            target_compile_definitions(${FORTARGET} PRIVATE ${object_definitions})
+        endif()
+        target_include_directories(${FORTARGET} PRIVATE ${object_includes})
+    endforeach()
 endmacro()
 
 # a function to change full installation paths to relative so that CPack

diff --git a/src/designer/CMakeLists.txt b/src/designer/CMakeLists.txt
index a407e6c..a30884d 100644 (file)
--- a/src/designer/CMakeLists.txt
+++ b/src/designer/CMakeLists.txt
@@ -1,6 +1,4 @@
 add_definitions(
-    ${SHAREDGRADIENDEDITOR_DEFINITIONS}
-    ${SHAREDPROPERTYBROWSER_DEFINITIONS}
     -DQT_SCRIPT_LIB
     -DKATIE_TOOLS_SUFFIX="${KATIE_TOOLS_SUFFIX}"
 )
@@ -61,9 +59,6 @@ set(DESIGNER_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/qdesignerexportwidget.h
     ${CMAKE_CURRENT_SOURCE_DIR}/qdesigner_components_global.h
     ${CMAKE_CURRENT_SOURCE_DIR}/qdesigner_components.h
-    ${SHAREDGRADIENDEDITOR_HEADERS}
-    ${SHAREDPROPERTYBROWSER_HEADERS}
-    ${SHAREDFINDWIDGET_HEADERS}
 )
 
 set(DESIGNER_SOURCES
@@ -86,9 +81,6 @@ include_directories(
     ${CMAKE_BINARY_DIR}/privateinclude/QtUiTools
     ${CMAKE_BINARY_DIR}/include/QtDesigner
     ${CMAKE_BINARY_DIR}/privateinclude/QtDesigner
-    ${SHAREDGRADIENDEDITOR_INCLUDES}
-    ${SHAREDPROPERTYBROWSER_INCLUDES}
-    ${SHAREDFINDWIDGET_INCLUDES}
     # for widgets.table
     ${CMAKE_SOURCE_DIR}/src/shared
     # for rcc.h

diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 0187d62..3cf8606 100644 (file)
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -49,7 +49,7 @@ set(SHAREDBEARER_HEADERS
 )
 katie_setup_target(sharedbearer ${SHAREDBEARER_SOURCES} ${SHAREDBEARER_HEADERS})
 add_library(sharedbearer OBJECT ${sharedbearer_SOURCES})
-target_include_directories(sharedbearer PRIVATE
+target_include_directories(sharedbearer PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/bearer
     ${CMAKE_CURRENT_BINARY_DIR}/bearer
 )

diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
new file mode 100644 (file)
index 0000000..028da8c
--- /dev/null
+++ b/src/shared/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory(findwidget)
+add_subdirectory(linguist)
+add_subdirectory(qtgradienteditor)
+add_subdirectory(qtpropertybrowser)

diff --git a/src/shared/findwidget/CMakeLists.txt b/src/shared/findwidget/CMakeLists.txt
new file mode 100644 (file)
index 0000000..db9666b
--- /dev/null
+++ b/src/shared/findwidget/CMakeLists.txt
@@ -0,0 +1,31 @@
+set(SHAREDFINDWIDGET_DEFINITIONS)
+
+set(SHAREDFINDWIDGET_INCLUDES
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/privateinclude
+    ${CMAKE_BINARY_DIR}/include/QtCore
+    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
+    ${CMAKE_BINARY_DIR}/include/QtGui
+    ${CMAKE_BINARY_DIR}/privateinclude/QtGui
+    ${CMAKE_SOURCE_DIR}/src/shared/findwidget
+    ${CMAKE_BINARY_DIR}/src/shared/findwidget
+)
+
+set(SHAREDFINDWIDGET_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/abstractfindwidget.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/texteditfindwidget.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/itemviewfindwidget.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/findwidget.qrc
+)
+
+set(SHAREDFINDWIDGET_HEADERS
+    ${CMAKE_CURRENT_SOURCE_DIR}/abstractfindwidget.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/texteditfindwidget.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/itemviewfindwidget.h
+)
+
+katie_setup_target(sharedfindwidget ${SHAREDFINDWIDGET_SOURCES} ${SHAREDFINDWIDGET_HEADERS})
+
+add_library(sharedfindwidget OBJECT ${sharedfindwidget_SOURCES})
+target_compile_definitions(sharedfindwidget PUBLIC ${SHAREDFINDWIDGET_DEFINITIONS})
+target_include_directories(sharedfindwidget PUBLIC ${SHAREDFINDWIDGET_INCLUDES})

diff --git a/src/shared/findwidget/findwidget.cmake b/src/shared/findwidget/findwidget.cmake
deleted file mode 100644 (file)
index 05134bf..0000000
--- a/src/shared/findwidget/findwidget.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-set(SHAREDFINDWIDGET_DEFINITIONS)
-
-set(SHAREDFINDWIDGET_INCLUDES
-    ${CMAKE_BINARY_DIR}/include
-    ${CMAKE_BINARY_DIR}/privateinclude
-    ${CMAKE_BINARY_DIR}/include/QtCore
-    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
-    ${CMAKE_BINARY_DIR}/include/QtGui
-    ${CMAKE_BINARY_DIR}/privateinclude/QtGui
-    ${CMAKE_SOURCE_DIR}/src/shared/findwidget
-    ${CMAKE_BINARY_DIR}/src/shared/findwidget
-)
-
-set(SHAREDFINDWIDGET_SOURCES
-    ${CMAKE_SOURCE_DIR}/src/shared/findwidget/abstractfindwidget.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/findwidget/texteditfindwidget.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/findwidget/itemviewfindwidget.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/findwidget/findwidget.qrc
-)
-
-set(SHAREDFINDWIDGET_HEADERS
-    ${CMAKE_SOURCE_DIR}/src/shared/findwidget/abstractfindwidget.h
-    ${CMAKE_SOURCE_DIR}/src/shared/findwidget/texteditfindwidget.h
-    ${CMAKE_SOURCE_DIR}/src/shared/findwidget/itemviewfindwidget.h
-)
-
-katie_setup_target(sharedfindwidget ${SHAREDFINDWIDGET_SOURCES} ${SHAREDFINDWIDGET_HEADERS})
-
-add_library(sharedfindwidget OBJECT ${sharedfindwidget_SOURCES})
-target_compile_definitions(sharedfindwidget PRIVATE ${SHAREDFINDWIDGET_DEFINITIONS})
-target_include_directories(sharedfindwidget PRIVATE ${SHAREDFINDWIDGET_INCLUDES})

diff --git a/src/shared/linguist/CMakeLists.txt b/src/shared/linguist/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1758de0
--- /dev/null
+++ b/src/shared/linguist/CMakeLists.txt
@@ -0,0 +1,35 @@
+set(SHAREDLINGUIST_DEFINITIONS
+)
+
+set(SHAREDLINGUIST_INCLUDES
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/privateinclude
+    ${CMAKE_BINARY_DIR}/include/QtCore
+    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
+    ${CMAKE_BINARY_DIR}/include/QtXml
+    ${CMAKE_BINARY_DIR}/privateinclude/QtXml
+    ${CMAKE_SOURCE_DIR}/src/shared/linguist
+)
+
+set(SHAREDLINGUIST_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/simtexth.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/numerus.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/translator.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/translatormessage.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qm.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qph.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/po.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ts.cpp
+)
+
+set(SHAREDLINGUIST_HEADERS
+    ${CMAKE_CURRENT_SOURCE_DIR}/simtexth.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/translator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/translatormessage.h
+)
+
+katie_setup_target(sharedlinguist ${SHAREDLINGUIST_SOURCES} ${SHAREDLINGUIST_HEADERS})
+
+add_library(sharedlinguist OBJECT ${sharedlinguist_SOURCES})
+target_compile_definitions(sharedlinguist PUBLIC ${SHAREDLINGUIST_DEFINITIONS})
+target_include_directories(sharedlinguist PUBLIC ${SHAREDLINGUIST_INCLUDES})

diff --git a/src/shared/linguist/linguist.cmake b/src/shared/linguist/linguist.cmake
deleted file mode 100644 (file)
index a8999c3..0000000
--- a/src/shared/linguist/linguist.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-set(SHAREDLINGUIST_DEFINITIONS
-)
-
-set(SHAREDLINGUIST_INCLUDES
-    ${CMAKE_BINARY_DIR}/include
-    ${CMAKE_BINARY_DIR}/privateinclude
-    ${CMAKE_BINARY_DIR}/include/QtCore
-    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
-    ${CMAKE_BINARY_DIR}/include/QtXml
-    ${CMAKE_BINARY_DIR}/privateinclude/QtXml
-    ${CMAKE_SOURCE_DIR}/src/shared/linguist
-)
-
-set(SHAREDLINGUIST_SOURCES
-    ${CMAKE_SOURCE_DIR}/src/shared/linguist/simtexth.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/linguist/numerus.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/linguist/translator.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/linguist/translatormessage.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/linguist/qm.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/linguist/qph.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/linguist/po.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/linguist/ts.cpp
-)
-
-set(SHAREDLINGUIST_HEADERS
-    ${CMAKE_SOURCE_DIR}/src/shared/linguist/simtexth.h
-    ${CMAKE_SOURCE_DIR}/src/shared/linguist/translator.h
-    ${CMAKE_SOURCE_DIR}/src/shared/linguist/translatormessage.h
-)
-
-katie_setup_target(sharedlinguist ${SHAREDLINGUIST_SOURCES} ${SHAREDLINGUIST_HEADERS})
-
-add_library(sharedlinguist OBJECT ${sharedlinguist_SOURCES})
-target_compile_definitions(sharedlinguist PRIVATE ${SHAREDLINGUIST_DEFINITIONS})
-target_include_directories(sharedlinguist PRIVATE ${SHAREDLINGUIST_INCLUDES})

diff --git a/src/shared/qtgradienteditor/CMakeLists.txt b/src/shared/qtgradienteditor/CMakeLists.txt
new file mode 100644 (file)
index 0000000..32b8e08
--- /dev/null
+++ b/src/shared/qtgradienteditor/CMakeLists.txt
@@ -0,0 +1,55 @@
+set(SHAREDGRADIENDEDITOR_DEFINITIONS)
+
+set(SHAREDGRADIENDEDITOR_INCLUDES
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/privateinclude
+    ${CMAKE_BINARY_DIR}/include/QtCore
+    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
+    ${CMAKE_BINARY_DIR}/include/QtGui
+    ${CMAKE_BINARY_DIR}/privateinclude/QtGui
+    ${CMAKE_BINARY_DIR}/include/QtXml
+    ${CMAKE_BINARY_DIR}/privateinclude/QtXml
+    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor
+    ${CMAKE_BINARY_DIR}/src/shared/qtgradienteditor
+)
+
+set(SHAREDGRADIENDEDITOR_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradienteditor.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientdialog.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientview.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientviewdialog.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientstopsmodel.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientstopswidget.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientstopscontroller.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientwidget.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradienteditor.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientdialog.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorbutton.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorline.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientview.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientviewdialog.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientmanager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientutils.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradienteditor.qrc
+)
+
+set(SHAREDGRADIENDEDITOR_HEADERS
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientstopsmodel.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientstopswidget.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientstopscontroller.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientwidget.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradienteditor.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientdialog.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorbutton.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorline.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientview.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientviewdialog.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientmanager.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgradientutils.h
+)
+
+katie_setup_target(sharedqtgradienteditor ${SHAREDGRADIENDEDITOR_SOURCES} ${SHAREDGRADIENDEDITOR_HEADERS})
+
+add_library(sharedqtgradienteditor OBJECT ${sharedqtgradienteditor_SOURCES})
+target_compile_definitions(sharedqtgradienteditor PUBLIC ${SHAREDGRADIENDEDITOR_DEFINITIONS})
+target_include_directories(sharedqtgradienteditor PUBLIC ${SHAREDGRADIENDEDITOR_INCLUDES})

diff --git a/src/shared/qtgradienteditor/qtgradienteditor.cmake b/src/shared/qtgradienteditor/qtgradienteditor.cmake
deleted file mode 100644 (file)
index f422ff1..0000000
--- a/src/shared/qtgradienteditor/qtgradienteditor.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-set(SHAREDGRADIENDEDITOR_DEFINITIONS)
-
-set(SHAREDGRADIENDEDITOR_INCLUDES
-    ${CMAKE_BINARY_DIR}/include
-    ${CMAKE_BINARY_DIR}/privateinclude
-    ${CMAKE_BINARY_DIR}/include/QtCore
-    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
-    ${CMAKE_BINARY_DIR}/include/QtGui
-    ${CMAKE_BINARY_DIR}/privateinclude/QtGui
-    ${CMAKE_BINARY_DIR}/include/QtXml
-    ${CMAKE_BINARY_DIR}/privateinclude/QtXml
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor
-    ${CMAKE_BINARY_DIR}/src/shared/qtgradienteditor
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(SHAREDGRADIENDEDITOR_SOURCES
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradienteditor.ui
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientdialog.ui
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientview.ui
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientviewdialog.ui
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientstopsmodel.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientstopswidget.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientwidget.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradienteditor.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientdialog.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtcolorbutton.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtcolorline.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientview.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientviewdialog.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientmanager.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientutils.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradienteditor.qrc
-)
-
-set(SHAREDGRADIENDEDITOR_HEADERS
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientstopsmodel.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientstopswidget.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientstopscontroller.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientwidget.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradienteditor.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientdialog.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtcolorbutton.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtcolorline.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientview.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientviewdialog.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientmanager.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtgradientutils.h
-)
-
-katie_setup_target(sharedqtgradienteditor ${SHAREDGRADIENDEDITOR_SOURCES} ${SHAREDGRADIENDEDITOR_HEADERS})
-
-add_library(sharedqtgradienteditor OBJECT ${sharedqtgradienteditor_SOURCES})
-target_compile_definitions(sharedqtgradienteditor PRIVATE ${SHAREDGRADIENDEDITOR_DEFINITIONS})
-target_include_directories(sharedqtgradienteditor PRIVATE ${SHAREDGRADIENDEDITOR_INCLUDES})

diff --git a/src/shared/qtpropertybrowser/CMakeLists.txt b/src/shared/qtpropertybrowser/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4e19e5b
--- /dev/null
+++ b/src/shared/qtpropertybrowser/CMakeLists.txt
@@ -0,0 +1,41 @@
+set(SHAREDPROPERTYBROWSER_DEFINITIONS)
+
+set(SHAREDPROPERTYBROWSER_INCLUDES
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/privateinclude
+    ${CMAKE_BINARY_DIR}/include/QtCore
+    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
+    ${CMAKE_BINARY_DIR}/include/QtGui
+    ${CMAKE_BINARY_DIR}/privateinclude/QtGui
+    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser
+    ${CMAKE_BINARY_DIR}/src/shared/qtpropertybrowser
+)
+
+set(SHAREDPROPERTYBROWSER_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtpropertybrowser.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtpropertymanager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qteditorfactory.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtvariantproperty.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qttreepropertybrowser.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtbuttonpropertybrowser.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgroupboxpropertybrowser.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtpropertybrowserutils.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtpropertybrowser.qrc
+)
+
+set(SHAREDPROPERTYBROWSER_HEADERS
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtpropertybrowser.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtpropertymanager.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qteditorfactory.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtvariantproperty.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qttreepropertybrowser.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtbuttonpropertybrowser.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtgroupboxpropertybrowser.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qtpropertybrowserutils_p.h
+)
+
+katie_setup_target(sharedqtpropertybrowser ${SHAREDPROPERTYBROWSER_SOURCES} ${SHAREDPROPERTYBROWSER_HEADERS})
+
+add_library(sharedqtpropertybrowser OBJECT ${sharedqtpropertybrowser_SOURCES})
+target_compile_definitions(sharedqtpropertybrowser PUBLIC ${SHAREDPROPERTYBROWSER_DEFINITIONS})
+target_include_directories(sharedqtpropertybrowser PUBLIC ${SHAREDPROPERTYBROWSER_INCLUDES})

diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.cmake b/src/shared/qtpropertybrowser/qtpropertybrowser.cmake
deleted file mode 100644 (file)
index 903e537..0000000
--- a/src/shared/qtpropertybrowser/qtpropertybrowser.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-set(SHAREDPROPERTYBROWSER_DEFINITIONS)
-
-set(SHAREDPROPERTYBROWSER_INCLUDES
-    ${CMAKE_BINARY_DIR}/include
-    ${CMAKE_BINARY_DIR}/privateinclude
-    ${CMAKE_BINARY_DIR}/include/QtCore
-    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
-    ${CMAKE_BINARY_DIR}/include/QtGui
-    ${CMAKE_BINARY_DIR}/privateinclude/QtGui
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser
-    ${CMAKE_BINARY_DIR}/src/shared/qtpropertybrowser
-)
-
-set(SHAREDPROPERTYBROWSER_SOURCES
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtpropertybrowser.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtpropertymanager.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qteditorfactory.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtvariantproperty.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtpropertybrowser.qrc
-)
-
-set(SHAREDPROPERTYBROWSER_HEADERS
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtpropertybrowser.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtpropertymanager.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qteditorfactory.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtvariantproperty.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qttreepropertybrowser.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
-    ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
-)
-
-katie_setup_target(sharedqtpropertybrowser ${SHAREDPROPERTYBROWSER_SOURCES} ${SHAREDPROPERTYBROWSER_HEADERS})
-
-add_library(sharedqtpropertybrowser OBJECT ${sharedqtpropertybrowser_SOURCES})
-target_compile_definitions(sharedqtpropertybrowser PRIVATE ${SHAREDPROPERTYBROWSER_DEFINITIONS})
-target_include_directories(sharedqtpropertybrowser PRIVATE ${SHAREDPROPERTYBROWSER_INCLUDES})

diff --git a/src/tools/designer/CMakeLists.txt b/src/tools/designer/CMakeLists.txt
index 593b714..62efe41 100644 (file)
--- a/src/tools/designer/CMakeLists.txt
+++ b/src/tools/designer/CMakeLists.txt
@@ -26,7 +26,6 @@ include_directories(
 )
 
 set(DESIGNERBIN_HEADERS
-    ${DESIGNERBIN_HEADERS}
     ${CMAKE_CURRENT_SOURCE_DIR}/qdesigner.h
     ${CMAKE_CURRENT_SOURCE_DIR}/qdesigner_toolwindow.h
     ${CMAKE_CURRENT_SOURCE_DIR}/qdesigner_formwindow.h
@@ -44,7 +43,6 @@ set(DESIGNERBIN_HEADERS
 )
 
 set(DESIGNERBIN_SOURCES
-    ${DESIGNERBIN_SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/qdesigner.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/qdesigner_toolwindow.cpp

diff --git a/src/tools/lconvert/CMakeLists.txt b/src/tools/lconvert/CMakeLists.txt
index aebaf32..83a6c7e 100644 (file)
--- a/src/tools/lconvert/CMakeLists.txt
+++ b/src/tools/lconvert/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_definitions(
     -DQT_NO_CAST_FROM_ASCII
     -DQT_NO_CAST_TO_ASCII
-    ${SHAREDLINGUIST_DEFINITIONS}
 )
 set(EXTRA_LCONVERT_LIBS KtCore KtXml)
 
@@ -12,22 +11,10 @@ include_directories(
     ${CMAKE_BINARY_DIR}/privateinclude/QtCore
     ${CMAKE_BINARY_DIR}/include/QtXml
     ${CMAKE_BINARY_DIR}/privateinclude/QtXml
-    ${SHAREDLINGUIST_INCLUDES}
 )
 
-set(LCONVERT_SOURCES
-    ${LCONVERT_SOURCES}
+add_executable(lconvert
     ${CMAKE_CURRENT_SOURCE_DIR}/lconvert.cpp
-)
-
-set(LCONVERT_HEADERS
-    ${LCONVERT_HEADERS}
-    ${SHAREDLINGUIST_HEADERS}
-)
-
-katie_setup_target(lconvert ${LCONVERT_SOURCES} ${LCONVERT_HEADERS})
-
-add_executable(lconvert ${lconvert_SOURCES}
     $<TARGET_OBJECTS:sharedlinguist>
 )
 target_link_libraries(lconvert ${EXTRA_LCONVERT_LIBS})
@@ -37,6 +24,8 @@ set_target_properties(lconvert PROPERTIES
     OUTPUT_NAME lconvert${KATIE_TOOLS_SUFFIX}
 )
 
+katie_setup_object(lconvert sharedlinguist)
+
 install(
     TARGETS lconvert
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/tools/lrelease/CMakeLists.txt b/src/tools/lrelease/CMakeLists.txt
index 29ca904..137d706 100644 (file)
--- a/src/tools/lrelease/CMakeLists.txt
+++ b/src/tools/lrelease/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_definitions(
     -DQT_NO_CAST_FROM_ASCII
     -DQT_NO_CAST_TO_ASCII
-    ${SHAREDLINGUIST_DEFINITIONS}
 )
 set(EXTRA_LRELEASE_LIBS KtCore KtXml)
 
@@ -12,22 +11,9 @@ include_directories(
     ${CMAKE_BINARY_DIR}/privateinclude/QtCore
     ${CMAKE_BINARY_DIR}/include/QtXml
     ${CMAKE_BINARY_DIR}/privateinclude/QtXml
-    ${SHAREDLINGUIST_INCLUDES}
 )
 
-set(LRELEASE_SOURCES
-    ${LRELEASE_SOURCES}
-    ${CMAKE_CURRENT_SOURCE_DIR}/lrelease.cpp
-)
-
-set(LRELEASE_HEADERS
-    ${LRELEASE_HEADERS}
-    ${SHAREDLINGUIST_HEADERS}
-)
-
-katie_setup_target(lrelease ${LRELEASE_SOURCES} ${LRELEASE_HEADERS})
-
-add_executable(lrelease ${lrelease_SOURCES}
+add_executable(lrelease ${CMAKE_CURRENT_SOURCE_DIR}/lrelease.cpp
     $<TARGET_OBJECTS:sharedlinguist>
 )
 target_link_libraries(lrelease ${EXTRA_LRELEASE_LIBS})
@@ -37,6 +23,8 @@ set_target_properties(lrelease PROPERTIES
     OUTPUT_NAME lrelease${KATIE_TOOLS_SUFFIX}
 )
 
+katie_setup_object(lrelease sharedlinguist)
+
 install(
     TARGETS lrelease
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/tools/lupdate/CMakeLists.txt b/src/tools/lupdate/CMakeLists.txt
index d1ae311..96fe224 100644 (file)
--- a/src/tools/lupdate/CMakeLists.txt
+++ b/src/tools/lupdate/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(${SHAREDLINGUIST_DEFINITIONS})
+# add_definitions()
 set(EXTRA_LUPDATE_LIBS KtCore KtXml)
 
 include_directories(
@@ -8,11 +8,9 @@ include_directories(
     ${CMAKE_BINARY_DIR}/privateinclude/QtCore
     ${CMAKE_BINARY_DIR}/include/QtXml
     ${CMAKE_BINARY_DIR}/privateinclude/QtXml
-    ${SHAREDLINGUIST_INCLUDES}
 )
 
 set(LUPDATE_SOURCES
-    ${LUPDATE_SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/lupdate.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/merge.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cpp.cpp
@@ -21,9 +19,7 @@ set(LUPDATE_SOURCES
 )
 
 set(LUPDATE_HEADERS
-    ${LUPDATE_HEADERS}
     ${CMAKE_CURRENT_SOURCE_DIR}/lupdate.h
-    ${SHAREDLINGUIST_HEADERS}
 )
 
 katie_setup_target(lupdate ${LUPDATE_SOURCES} ${LUPDATE_HEADERS})
@@ -38,6 +34,8 @@ set_target_properties(lupdate PROPERTIES
     OUTPUT_NAME lupdate${KATIE_TOOLS_SUFFIX}
 )
 
+katie_setup_object(lupdate sharedlinguist)
+
 install(
     TARGETS lupdate
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}