From fabe2f724432dc6e7f00878df2ec965cd0ab03a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 7 Jul 2020 16:53:02 +0200 Subject: [PATCH] Use EMBED to merge a static library into a kpart module to avoid building the same source files twice. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- domino/CMakeLists.txt | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/domino/CMakeLists.txt b/domino/CMakeLists.txt index 01fb7f6..09a1f91 100644 --- a/domino/CMakeLists.txt +++ b/domino/CMakeLists.txt @@ -20,34 +20,31 @@ link_directories( ) -set( _srcs domino.cpp misc.cpp ) -set( _libs tdecore-shared tdeui-shared tdeutils-shared - ${X11_LIBRARIES} ${XFT_LIBRARIES} - ${XCB_SHAPE_LIBRARIES} ${FREETYPE_LIBRARIES} -) - - -##### domino (kpart) +##### domino_style (STATIC) -tde_add_kpart( domino AUTOMOC +tde_add_library( domino_style STATIC_PIC AUTOMOC SOURCES - ${_srcs} + domino.cpp misc.cpp LINK - ${_libs} - - DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles + tdecore-shared tdeui-shared tdeutils-shared + ${X11_LIBRARIES} ${XFT_LIBRARIES} + ${XCB_SHAPE_LIBRARIES} ${FREETYPE_LIBRARIES} ) -##### domino_style (STATIC) +##### domino (kpart) -tde_add_library( domino_style STATIC_PIC AUTOMOC +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) + +tde_add_kpart( domino AUTOMOC SOURCES - ${_srcs} - LINK - ${_libs} + dummy.cpp + EMBED + domino_style-static + + DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles )