1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
Index: qt-color-widgets/color_widgets_designer_plugin/CMakeLists.txt
===================================================================
--- qt-color-widgets.orig/color_widgets_designer_plugin/CMakeLists.txt
+++ qt-color-widgets/color_widgets_designer_plugin/CMakeLists.txt
@@ -52,7 +52,7 @@ endif (Wextra_FLAG_SUPPORTED)
# Library
set (TARGET_NAME ${PROJECT_NAME})
-set (TARGET_OUTPUT_SUFFIX "-Qt${QT_VERSION}${${PROJECT_NAME}_VERSION_MAJOR}")
+set (TARGET_OUTPUT_SUFFIX "")
add_library (${TARGET_NAME} SHARED "")
set_target_properties(${TARGET_NAME}
@@ -63,8 +63,6 @@ set_target_properties (${TARGET_NAME}
PROPERTIES
CXX_STANDARD 11
CXX_STANDARD_REQUIRED ON
- VERSION ${${PROJECT_NAME}_VERSION}
- SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}
"INTERFACE_${PROJECT_NAME}_MAJOR_VERSION" ${${PROJECT_NAME}_VERSION_MAJOR}
COMPATIBLE_INTERFACE_STRING "${PROJECT_NAME}_MAJOR_VERSION"
OUTPUT_NAME "${TARGET_NAME}${TARGET_OUTPUT_SUFFIX}")
@@ -124,25 +122,5 @@ endforeach (HEADER IN HEADERS)
# install
-get_target_property (QT_QMAKE_EXECUTABLE
- Qt${QT_VERSION_MAJOR}::qmake LOCATION)
-
-execute_process (
- COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS
- OUTPUT_VARIABLE QT_INSTALL_PLUGINS
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-# install(TARGETS ${COLOR_WIDGETS_PLUGIN} DESTINATION ${QT_INSTALL_PLUGINS}/designer OPTIONAL)
-
-execute_process (
- COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_LIBS
- OUTPUT_VARIABLE QT_INSTALL_LIBS
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-# install(TARGETS ${COLOR_WIDGETS_PLUGIN} DESTINATION ${QT_INSTALL_LIBS}/qtcreator/plugins OPTIONAL)
-
-add_custom_target(${TARGET_NAME}_install
- COMMAND cp $<TARGET_FILE:${TARGET_NAME}> ${QT_INSTALL_PLUGINS}/designer
- COMMAND cp $<TARGET_FILE:${TARGET_NAME}> ${QT_INSTALL_LIBS}/qtcreator/plugins
- DEPENDS ${TARGET_NAME}
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+include(GNUInstallDirs)
+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt5/plugins/designer)
|
