blob: c216b6f13c2e13a0fefe984bdc6df58912b75299 (
plain)
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
|
Index: src/qmmp/CMakeLists.txt
===================================================================
--- src/qmmp/CMakeLists.txt (revisión: 9311)
+++ src/qmmp/CMakeLists.txt (copia de trabajo)
@@ -146,10 +146,10 @@
IF(APP_NAME_SUFFIX)
install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX}/qmmp)
- SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX})
+ SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX})
ELSE()
install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qmmp)
- SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+ SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
ENDIF()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmp${APP_NAME_SUFFIX}.pc @ONLY)
Index: src/qmmp/qmmp.pc.in
===================================================================
--- src/qmmp/qmmp.pc.in (revisión: 9311)
+++ src/qmmp/qmmp.pc.in (copia de trabajo)
@@ -1,8 +1,8 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
-includedir=@QMMP_INCLUDE_DIR@
-plugindir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/qmmp-@QMMP_VERSION_MAJOR@.@QMMP_VERSION_MINOR@
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${exec_prefix}/@QMMP_INCLUDE_DIR@
+plugindir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@/qmmp-@QMMP_VERSION_MAJOR@.@QMMP_VERSION_MINOR@
Name: qmmp@APP_NAME_SUFFIX@
Description: qmmp core library
Index: src/qmmpui/CMakeLists.txt
===================================================================
--- src/qmmpui/CMakeLists.txt (revisión: 9311)
+++ src/qmmpui/CMakeLists.txt (copia de trabajo)
@@ -146,10 +146,10 @@
IF(APP_NAME_SUFFIX)
install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX}/qmmpui)
- SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX})
+ SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX})
ELSE()
install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qmmpui)
- SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+ SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
ENDIF()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmpui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmpui${APP_NAME_SUFFIX}.pc @ONLY)
Index: src/qmmpui/qmmpui.pc.in
===================================================================
--- src/qmmpui/qmmpui.pc.in (revisión: 9311)
+++ src/qmmpui/qmmpui.pc.in (copia de trabajo)
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
-includedir=@QMMP_INCLUDE_DIR@
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${exec_prefix}/@QMMP_INCLUDE_DIR@
Name: qmmpui@APP_NAME_SUFFIX@
Description: qmmp user interface library
|