mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3068 from akallabeth/pkg_config_fix

Browse Source 
Fix pkg-config generation.
This commit is contained in:
Martin Fleisz 2016-01-19 09:24:22 +01:00
commit 90783c7f8a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rdtk/CMakeLists.txt
View File

@ -73,6 +73,7 @@ if(WITH_SAMPLE)
endif()
# Exporting
set(RDTK_INCLUDE_DIR "include/rdtk${RDTK_VERSION_MAJOR}")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rdtk.pc.in ${CMAKE_CURRENT_BINARY_DIR}/rdtk${RDTK_VERSION_MAJOR}.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rdtk${RDTK_VERSION_MAJOR}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
@ -81,8 +82,6 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
set(RDTK_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/RdTk${RDTK_VERSION_MAJOR}")
set(RDTK_INCLUDE_DIR "include/rdtk${RDTK_VERSION_MAJOR}")
configure_package_config_file(RdTkConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/RdTkConfig.cmake
INSTALL_DESTINATION ${RDTK_CMAKE_INSTALL_DIR} PATH_VARS RDTK_INCLUDE_DIR)

2
winpr/winpr.pc.in
View File

@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=${libdir}/@WINPR_INCLUDE_DIR@
includedir=${prefix}/@WINPR_INCLUDE_DIR@
libs=-lwinpr
Name: WinPR