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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
diff -ruN liblastfm-1.0.9.orig/CMakeLists.txt liblastfm-1.0.9/CMakeLists.txt
--- liblastfm-1.0.9.orig/CMakeLists.txt 2014-10-02 16:05:46.000000000 +0200
+++ liblastfm-1.0.9/CMakeLists.txt 2018-06-07 19:12:38.439957140 +0200
@@ -35,6 +35,7 @@
endif()
if(Qt5Core_DIR)
+ find_package(Qt5 REQUIRED COMPONENTS Core Network Xml Sql Test)
set(LASTFM_LIB_VERSION_SUFFIX 5)
message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..")
include_directories(${Qt5Core_INCLUDE_DIRS})
@@ -57,8 +58,8 @@
else()
find_package(Qt4 COMPONENTS QtCore QtNetwork QtXml REQUIRED)
- macro(qt5_use_modules)
- endmacro()
+ #macro(qt5_use_modules)
+ #endmacro()
endif()
diff -ruN liblastfm-1.0.9.orig/src/CMakeLists.txt liblastfm-1.0.9/src/CMakeLists.txt
--- liblastfm-1.0.9.orig/src/CMakeLists.txt 2014-10-02 16:05:46.000000000 +0200
+++ liblastfm-1.0.9/src/CMakeLists.txt 2018-06-07 19:20:37.969353324 +0200
@@ -10,8 +10,8 @@
)
list(APPEND liblastfm_QT5_MODULES
- Xml
- Network
+ Qt5::Xml
+ Qt5::Network
)
set(liblastfm_SOURCES
@@ -84,11 +84,11 @@
linux/LNetworkConnectionMonitor_linux.cpp
)
list(APPEND liblastfm_LIBRARIES ${QT_QTDBUS_LIBRARY})
- list(APPEND liblastfm_QT5_MODULES DBus)
+ list(APPEND liblastfm_QT5_MODULES Qt5::DBus)
endif()
add_library(${LASTFM_LIB_TARGET_NAME} SHARED ${liblastfm_SOURCES})
-qt5_use_modules(${LASTFM_LIB_TARGET_NAME} ${liblastfm_QT5_MODULES})
+target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${liblastfm_QT5_MODULES})
target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${liblastfm_LIBRARIES})
set_target_properties(${LASTFM_LIB_TARGET_NAME} PROPERTIES
@@ -105,4 +105,4 @@
file(GLOB liblastfm_HEADERS ${CMAKE_CURRENT_LIST_DIR}/*.h)
list(APPEND liblastfm_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/global.h)
-install(FILES ${liblastfm_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lastfm/)
+install(FILES ${liblastfm_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lastfm${LASTFM_LIB_VERSION_SUFFIX}/)
diff -ruN liblastfm-1.0.9.orig/src/fingerprint/CMakeLists.txt liblastfm-1.0.9/src/fingerprint/CMakeLists.txt
--- liblastfm-1.0.9.orig/src/fingerprint/CMakeLists.txt 2014-10-02 16:05:46.000000000 +0200
+++ liblastfm-1.0.9/src/fingerprint/CMakeLists.txt 2018-06-07 19:21:06.457202117 +0200
@@ -40,7 +40,7 @@
SOVERSION ${LASTFM_SOVERSION}
)
-qt5_use_modules(${FINGERPRINT_LIB_TARGET_NAME} Network Sql Xml)
+target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} Qt5::Network Qt5::Sql Qt5::Xml)
install(TARGETS ${FINGERPRINT_LIB_TARGET_NAME}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -48,4 +48,5 @@
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
-install(FILES ${lastfm_fingerprint_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lastfm/)
+install(FILES ${lastfm_fingerprint_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lastfm${LASTFM_LIB_VERSION_SUFFIX}/)
+
diff -ruN liblastfm-1.0.9.orig/tests/lastfm_add_test.cmake liblastfm-1.0.9/tests/lastfm_add_test.cmake
--- liblastfm-1.0.9.orig/tests/lastfm_add_test.cmake 2014-10-02 16:05:46.000000000 +0200
+++ liblastfm-1.0.9/tests/lastfm_add_test.cmake 2018-06-07 18:49:26.760253021 +0200
@@ -6,7 +6,7 @@
configure_file(Test${LASTFM_TEST_CLASS}.h Test${LASTFM_TEST_CLASS}.h)
add_executable(${LASTFM_TEST_CLASS}Test Test${LASTFM_TEST_CLASS}.cpp)
- qt5_use_modules(${LASTFM_TEST_CLASS}Test Core Test Xml Network)
+ target_link_libraries(${LASTFM_TEST_CLASS}Test Qt5::Core Qt5::Test Qt5::Xml Qt5::Network)
target_link_libraries(${LASTFM_TEST_CLASS}Test
${LASTFM_LIB_TARGET_NAME}
|
