cheng/libexpat
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'DerDakon-CMake-pc' (merge request #176)

Browse Source
This commit is contained in:
Sebastian Pipping 2017-12-13 19:51:18 +01:00
commit e6e45f3c6d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
expat/CMakeLists.txt
View File

@ -142,10 +142,10 @@ expat_install(TARGETS expat RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib)
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix "\${prefix}/bin")
set(libdir "\${prefix}/lib")
set(exec_prefix "\${prefix}")
set(libdir "\${exec_prefix}/lib")
set(includedir "\${prefix}/include")
configure_file(expat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/expat.pc)
configure_file(expat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/expat.pc @ONLY)
expat_install(FILES lib/expat.h lib/expat_external.h DESTINATION include)
expat_install(FILES ${CMAKE_CURRENT_BINARY_DIR}/expat.pc DESTINATION lib/pkgconfig)

2
expat/Changes
View File

@ -13,6 +13,7 @@ Release 2.2.? ???????????????????
file systems
#174 CMake: Introduce option WARNINGS_AS_ERRORS, defaults to OFF
#175 CMake: Prefer check_symbol_exists over check_function_exists
#176 CMake: Create the same pkg-config file as with GNU Autotools
#131 #173 Address compiler warnings
Special thanks to:
@ -20,6 +21,7 @@ Release 2.2.? ???????????????????
Franek Korta
Joe Orton
Rainer Jung
Rolf Eike Beer
Release 2.2.5 Tue October 31 2017
Bug fixes: