Ticket #46507: add-utilslib-infix.patch

CMakeLists.txt

@@ -44 +44 @@
 option(QTC_GTK2_MODIFY_MOZILLA "Modify Mozilla Gtk2 with js and css." Off)
 
 ## Common settings.
+# support an infix argument to have different qtcurve-utils libraries, e.g. for
+# GTk2, Qt4 and Qt5
+if(DEFINED QTC_UTILSLIB_INFIX)
+    set(QTC_UTILS_LIBRARY "qtcurve-utils-${QTC_UTILSLIB_INFIX}")
+else()
+    set(QTC_UTILS_LIBRARY "qtcurve-utils")
+endif()
+message(STATUS "QTC_UTILS_LIBRARY=${QTC_UTILS_LIBRARY}")
+
 # Only try to figure out what kde prefix is if not specified at command line.
 if(NOT DEFINED QTC_KDE4_PREFIX)
   find_package(KDE4)

gtk2/style/CMakeLists.txt

@@ -84 +84 @@
 target_link_libraries(qtcurve-gtk2
   ${GTK2_LDFLAGS}
   ${GTK2_LIBRARIES}
-  qtcurve-utils qtcurve-cairo m)
+  ${QTC_UTILS_LIBRARY} qtcurve-cairo m)
 
 install(TARGETS qtcurve-gtk2 LIBRARY DESTINATION
   ${GTK2_LIBDIR}/gtk-2.0/${GTK2_BIN_VERSION}/engines)

lib/cairo/CMakeLists.txt

@@ -12 +12 @@
   REQUIRED cairo
   REQUIRED pangocairo)
 include_directories(${CAIRO_INCLUDE_DIRS})
-set(qtcurve_cairo_LINKS qtcurve-utils ${CAIRO_LDFLAGSF} ${CAIRO_LIBRARIES})
+set(qtcurve_cairo_LINKS ${QTC_UTILS_LIBRARY} ${CAIRO_LDFLAGSF} ${CAIRO_LIBRARIES})
 add_definitions("-DQTC_UTILS_INTERNAL" ${CAIRO_CFLAGS})
 
 add_library(qtcurve-cairo SHARED ${qtcurve_cairo_SRCS})

lib/utils/CMakeLists.txt

@@ -33 +33 @@
 
 add_definitions("-DQTC_UTILS_INTERNAL -pthread")
 
-add_library(qtcurve-utils SHARED
+add_library(${QTC_UTILS_LIBRARY} SHARED
   ${qtcurve_utils_SRCS})
 
-target_link_libraries(qtcurve-utils ${qtcurve_utils_LINKS})
+target_link_libraries(${QTC_UTILS_LIBRARY} ${qtcurve_utils_LINKS})
 
-set_target_properties(qtcurve-utils PROPERTIES
+set_target_properties(${QTC_UTILS_LIBRARY} PROPERTIES
   VERSION 1.0
   SOVERSION 1
   COMPILE_FLAGS "-fvisibility=hidden"
   LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-install(TARGETS qtcurve-utils LIBRARY
+install(TARGETS ${QTC_UTILS_LIBRARY} LIBRARY
   DESTINATION "${LIB_INSTALL_DIR}")

qt4/config/CMakeLists.txt

@@ -55 +55 @@
 target_link_libraries(kstyle_qtcurve_config_kde4
   ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}
   ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}
-  qtcurve-utils)
+  ${QTC_UTILS_LIBRARY})
 install(TARGETS kstyle_qtcurve_config_kde4
   DESTINATION "${PLUGIN_INSTALL_DIR}")
 install(FILES QtCurveui.rc DESTINATION "${DATA_INSTALL_DIR}/QtCurve")

qt4/kwin/CMakeLists.txt

@@ -36 +36 @@
   LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
   OUTPUT_NAME "kwin3_qtcurve")
 target_link_libraries(kwin3_qtcurve_kde4 kdecorations
-  ${KDE4_KDEUI_LIBS} qtcurve-utils)
+  ${KDE4_KDEUI_LIBS} ${QTC_UTILS_LIBRARY})
 install(TARGETS kwin3_qtcurve_kde4 DESTINATION "${PLUGIN_INSTALL_DIR}")
 install(FILES qtcurve.desktop DESTINATION "${DATA_INSTALL_DIR}/kwin/")

qt4/kwinconfig/CMakeLists.txt

@@ -25 +25 @@
   OUTPUT_NAME "kwin_qtcurve_config")
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 target_link_libraries(kwin_qtcurve_config_kde4
-  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} qtcurve-utils)
+  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QTC_UTILS_LIBRARY})
 install(TARGETS kwin_qtcurve_config_kde4 DESTINATION ${PLUGIN_INSTALL_DIR})

qt4/style/CMakeLists.txt

@@ -79 +79 @@
   ${QT_QTCORE_LIBRARY}
   ${QT_QTSVG_LIBRARY}
   ${QT_QTDBUS_LIBRARY}
-  qtcurve-utils)
+  ${QTC_UTILS_LIBRARY})
 
 if(QTC_QT4_ENABLE_KDE)
   install(TARGETS qtcurve-qt4 DESTINATION ${QTCURVE_STYLE_DIR})

qt5/config/CMakeLists.txt

@@ -60 +60 @@
   KF5::KIOWidgets
   KF5::WidgetsAddons
   KF5::XmlGui)
-target_link_libraries(kstyle_qtcurve5_config qtcurve-utils)
+target_link_libraries(kstyle_qtcurve5_config ${QTC_UTILS_LIBRARY})
 
 install(TARGETS kstyle_qtcurve5_config DESTINATION ${QT_PLUGIN_INSTALL_DIR})

qt5/kwin/CMakeLists.txt

@@ -36 +36 @@
   LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
   OUTPUT_NAME "kwin3_qtcurve")
 target_link_libraries(kwin3_qtcurve_kde4 kdecorations
-  ${KDE4_KDEUI_LIBS} qtcurve-utils)
+  ${KDE4_KDEUI_LIBS} ${QTC_UTILS_LIBRARY})
 install(TARGETS kwin3_qtcurve_kde4 DESTINATION "${PLUGIN_INSTALL_DIR}")
 install(FILES qtcurve.desktop DESTINATION "${DATA_INSTALL_DIR}/kwin/")

qt5/kwinconfig/CMakeLists.txt

@@ -25 +25 @@
   OUTPUT_NAME "kwin_qtcurve_config")
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 target_link_libraries(kwin_qtcurve_config_kde4
-  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} qtcurve-utils)
+  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QTC_UTILS_LIBRARY})
 install(TARGETS kwin_qtcurve_config_kde4 DESTINATION ${PLUGIN_INSTALL_DIR})

qt5/style/CMakeLists.txt

@@ -62 +62 @@
 add_dependencies(qtcurve-qt5 qtc_qt5_check_on_hdr qtc_qt5_check_x_on_hdr
   qtc_qt5_dialog_error_hdr qtc_qt5_dialog_information_hdr
   qtc_qt5_dialog_warning_hdr)
-target_link_libraries(qtcurve-qt5 ${QTC_QT5_LINK_LIBS} qtcurve-utils)
+target_link_libraries(qtcurve-qt5 ${QTC_QT5_LINK_LIBS} ${QTC_UTILS_LIBRARY})
 install(TARGETS qtcurve-qt5 LIBRARY DESTINATION ${QTCURVE_STYLE_DIR})
 
 if(QTC_QT5_ENABLE_KDE)

test/CMakeLists.txt

@@ -4 +4 @@
 remove_definitions(-DNDEBUG)
 
 add_executable(test-version test-version.c)
-target_link_libraries(test-version qtcurve-utils)
+target_link_libraries(test-version ${QTC_UTILS_LIBRARY})
 add_test(NAME test-version COMMAND test-version)
 
 add_executable(test-buff test-buff.c)
-target_link_libraries(test-buff qtcurve-utils)
+target_link_libraries(test-buff ${QTC_UTILS_LIBRARY})
 add_test(NAME test-buff COMMAND test-buff)
 
 add_executable(test-search test-search.c)
-target_link_libraries(test-search qtcurve-utils)
+target_link_libraries(test-search ${QTC_UTILS_LIBRARY})
 add_test(NAME test-search COMMAND test-search)
 
 add_executable(test-strmap test-strmap.c)
-target_link_libraries(test-strmap qtcurve-utils)
+target_link_libraries(test-strmap ${QTC_UTILS_LIBRARY})
 add_test(NAME test-strmap COMMAND test-strmap)
 
 add_executable(test-printf test-printf.c)
-target_link_libraries(test-printf qtcurve-utils)
+target_link_libraries(test-printf ${QTC_UTILS_LIBRARY})
 add_test(NAME test-printf COMMAND test-printf)
 
 add_executable(test-strlist test-strlist.c)
-target_link_libraries(test-strlist qtcurve-utils)
+target_link_libraries(test-strlist ${QTC_UTILS_LIBRARY})
 add_test(NAME test-strlist COMMAND test-strlist)
 
 add_executable(test-default-arg test-default-arg.c)
-target_link_libraries(test-default-arg qtcurve-utils)
+target_link_libraries(test-default-arg ${QTC_UTILS_LIBRARY})
 add_test(NAME test-default-arg COMMAND test-default-arg)
 
 add_executable(test-default-arg-cpp test-default-arg.cpp)
-target_link_libraries(test-default-arg-cpp qtcurve-utils)
+target_link_libraries(test-default-arg-cpp ${QTC_UTILS_LIBRARY})
 add_test(NAME test-default-arg-cpp COMMAND test-default-arg-cpp)
 
 add_executable(test-color-str test-color-str.c)
-target_link_libraries(test-color-str qtcurve-utils)
+target_link_libraries(test-color-str ${QTC_UTILS_LIBRARY})
 add_test(NAME test-color-str COMMAND test-color-str)
 
 add_executable(test-default test-default.c)
-target_link_libraries(test-default qtcurve-utils)
+target_link_libraries(test-default ${QTC_UTILS_LIBRARY})
 add_test(NAME test-default COMMAND test-default)
 
 add_executable(test-default-cpp test-default.cpp)
-target_link_libraries(test-default-cpp qtcurve-utils)
+target_link_libraries(test-default-cpp ${QTC_UTILS_LIBRARY})
 add_test(NAME test-default-cpp COMMAND test-default-cpp)
 
 add_executable(test-call test-call.c)
-target_link_libraries(test-call qtcurve-utils)
+target_link_libraries(test-call ${QTC_UTILS_LIBRARY})
 add_test(NAME test-call COMMAND test-call)
 
 add_executable(test-call-cpp test-call.cpp)
-target_link_libraries(test-call-cpp qtcurve-utils)
+target_link_libraries(test-call-cpp ${QTC_UTILS_LIBRARY})
 add_test(NAME test-call-cpp COMMAND test-call-cpp)
 
 add_executable(test-process test-process.c)
-target_link_libraries(test-process qtcurve-utils)
+target_link_libraries(test-process ${QTC_UTILS_LIBRARY})
 add_test(NAME test-process COMMAND test-process)
 
 add_executable(test-popen test-popen.c)
-target_link_libraries(test-popen qtcurve-utils)
+target_link_libraries(test-popen ${QTC_UTILS_LIBRARY})
 add_test(NAME test-popen COMMAND test-popen)
 
 add_executable(test-popen-buff test-popen-buff.c)
-target_link_libraries(test-popen-buff qtcurve-utils)
+target_link_libraries(test-popen-buff ${QTC_UTILS_LIBRARY})
 add_test(NAME test-popen-buff COMMAND test-popen-buff)