From 90f20bce43b3cf42330e0f17d2daf51fc46874e1 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 19 Nov 2017 12:37:13 +0100 Subject: [PATCH 1/4] generate and install pkg-config file --- src/CMakeLists.txt | 6 +++++- src/libiec61850.pc.in | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 src/libiec61850.pc.in diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 49938c32..f39e7ad8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -367,10 +367,14 @@ if(MSVC) endif() ENDIF(WITH_WPCAP) +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/libiec61850.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc @ONLY +) +install(FILES libiec61850.pc DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig") install (TARGETS iec61850 iec61850-shared RUNTIME DESTINATION bin COMPONENT Applications ARCHIVE DESTINATION lib COMPONENT Libraries LIBRARY DESTINATION lib COMPONENT Libraries ) - diff --git a/src/libiec61850.pc.in b/src/libiec61850.pc.in new file mode 100644 index 00000000..ec2b0d23 --- /dev/null +++ b/src/libiec61850.pc.in @@ -0,0 +1,13 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@/bin +libdir=@CMAKE_INSTALL_PREFIX@/lib +sharedlibdir=@CMAKE_INSTALL_PREFIX@/lib +includedir=@CMAKE_INSTALL_PREFIX@/include + +Name: @PROJECT_NAME@ +Description: @CPACK_PACKAGE_DESCRIPTION@ +Version: @LIB_VERSION_MAJOR@.@LIB_VERSION_MINOR@.@LIB_VERSION_PATCH@ + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -liec61850 +Cflags: -I${includedir} From f5e21a41bf4557b55a8b76a8ca8376391066069c Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 19 Nov 2017 12:39:48 +0100 Subject: [PATCH 2/4] generate pkg-config file only on Unixes (Linux, BSD, Apple) --- src/CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f39e7ad8..dabbb13a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -367,11 +367,13 @@ if(MSVC) endif() ENDIF(WITH_WPCAP) -configure_file( - ${CMAKE_CURRENT_LIST_DIR}/libiec61850.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc @ONLY -) -install(FILES libiec61850.pc DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig") +if(UNIX) + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/libiec61850.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc @ONLY + ) + install(FILES libiec61850.pc DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig") +endif() install (TARGETS iec61850 iec61850-shared RUNTIME DESTINATION bin COMPONENT Applications From 8c1d9b1cbe5ce27352e94676550e44ffab15e861 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 19 Nov 2017 12:44:58 +0100 Subject: [PATCH 3/4] added entry to changeling --- CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2fc311be..15234c1b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +Changes to version 1.2.0 +------------------------ + +- Added pkg-config file + Changes to version 1.1.0 ------------------------ From f4fea90ce3ccbbf550ee8b242b17ea06966addf6 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 19 Nov 2017 13:57:43 +0100 Subject: [PATCH 4/4] fix install() --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dabbb13a..86aa8277 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -372,7 +372,7 @@ if(UNIX) ${CMAKE_CURRENT_LIST_DIR}/libiec61850.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc @ONLY ) - install(FILES libiec61850.pc DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig") endif() install (TARGETS iec61850 iec61850-shared