]>
Commit | Line | Data |
---|---|---|
d51802d6 JB |
1 | --- pugixml-1.9/CMakeLists.txt.orig 2018-04-04 16:53:16.000000000 +0200 |
2 | +++ pugixml-1.9/CMakeLists.txt 2018-12-01 21:26:48.544256728 +0100 | |
3 | @@ -55,11 +55,6 @@ | |
4 | set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1) | |
92afb597 JB |
5 | get_target_property(PUGIXML_VERSION_STRING pugixml VERSION) |
6 | ||
7 | -if(BUILD_PKGCONFIG) | |
8 | - # Install library into its own directory under LIBDIR | |
9 | - set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING}) | |
10 | -endif() | |
11 | - | |
d51802d6 JB |
12 | target_include_directories(pugixml PUBLIC |
13 | $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> | |
14 | $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX}>) | |
15 | @@ -73,7 +68,7 @@ | |
92afb597 JB |
16 | |
17 | if(BUILD_PKGCONFIG) | |
18 | configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY) | |
19 | - install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) | |
d51802d6 | 20 | + install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) |
92afb597 JB |
21 | endif() |
22 | ||
23 | if(BUILD_TESTS) | |
24 | --- pugixml-1.8/scripts/pugixml.pc.in.orig 1970-01-01 01:00:00.000000000 +0100 | |
25 | +++ pugixml-1.8/scripts/pugixml.pc.in 2017-02-25 14:44:49.164006784 +0100 | |
26 | @@ -1,7 +1,7 @@ | |
27 | prefix=@CMAKE_INSTALL_PREFIX@ | |
28 | exec_prefix=${prefix} | |
29 | -includedir=${prefix}/include/pugixml-@PUGIXML_VERSION_STRING@ | |
30 | -libdir=${exec_prefix}/lib/pugixml-@PUGIXML_VERSION_STRING@ | |
31 | +includedir=${prefix}/include | |
32 | +libdir=@CMAKE_INSTALL_LIBDIR@ | |
33 | ||
34 | Name: pugixml | |
35 | Description: Light-weight, simple and fast XML parser for C++ with XPath support. |