62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
diff -Naur libssh-0.6.4-orig/cmake/Modules/DefineInstallationPaths.cmake libssh-0.6.4/cmake/Modules/DefineInstallationPaths.cmake
|
|
--- libssh-0.6.4-orig/cmake/Modules/DefineInstallationPaths.cmake 2014-09-15 22:54:34.000000000 +0400
|
|
+++ libssh-0.6.4/cmake/Modules/DefineInstallationPaths.cmake 2014-12-25 12:45:52.735000000 +0300
|
|
@@ -1,4 +1,4 @@
|
|
-if (UNIX OR OS2)
|
|
+if (UNIX OR OS2 OR MINGW)
|
|
IF (NOT APPLICATION_NAME)
|
|
MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME")
|
|
SET(APPLICATION_NAME ${PROJECT_NAME})
|
|
diff -Naur libssh-0.6.4-orig/CMakeLists.txt libssh-0.6.4/CMakeLists.txt
|
|
--- libssh-0.6.4-orig/CMakeLists.txt 2014-12-19 11:11:27.000000000 +0300
|
|
+++ libssh-0.6.4/CMakeLists.txt 2014-12-25 12:41:43.298000000 +0300
|
|
@@ -84,8 +84,8 @@
|
|
add_subdirectory(src)
|
|
|
|
# pkg-config file
|
|
-configure_file(libssh.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc)
|
|
-configure_file(libssh_threads.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libssh_threads.pc)
|
|
+configure_file(libssh.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc @ONLY)
|
|
+configure_file(libssh_threads.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libssh_threads.pc @ONLY)
|
|
install(
|
|
FILES
|
|
${CMAKE_CURRENT_BINARY_DIR}/libssh.pc
|
|
diff -Naur libssh-0.6.4-orig/libssh.pc.cmake libssh-0.6.4/libssh.pc.cmake
|
|
--- libssh-0.6.4-orig/libssh.pc.cmake 2013-02-07 22:23:14.000000000 +0400
|
|
+++ libssh-0.6.4/libssh.pc.cmake 2014-12-25 12:44:04.023000000 +0300
|
|
@@ -1,6 +1,11 @@
|
|
-Name: ${APPLICATION_NAME}
|
|
+prefix=@CMAKE_INSTALL_PREFIX@
|
|
+exec_prefix=${prefix}/bin
|
|
+libdir=@LIB_INSTALL_DIR@
|
|
+includedir=@INCLUDE_INSTALL_DIR@
|
|
+
|
|
+Name: @APPLICATION_NAME@
|
|
Description: The SSH Library
|
|
-Version: ${APPLICATION_VERSION}
|
|
-Libs: -L${LIB_INSTALL_DIR} -lssh
|
|
-Cflags: -I${INCLUDE_INSTALL_DIR}
|
|
+Version: @APPLICATION_VERSION@
|
|
+Libs: -L${libdir} -lssh
|
|
+Cflags: -I${includedir}
|
|
|
|
diff -Naur libssh-0.6.4-orig/libssh_threads.pc.cmake libssh-0.6.4/libssh_threads.pc.cmake
|
|
--- libssh-0.6.4-orig/libssh_threads.pc.cmake 2014-09-15 22:54:34.000000000 +0400
|
|
+++ libssh-0.6.4/libssh_threads.pc.cmake 2014-12-25 12:43:12.932000000 +0300
|
|
@@ -1,6 +1,11 @@
|
|
-Name: ${APPLICATION_NAME}_threads
|
|
+prefix=@CMAKE_INSTALL_PREFIX@
|
|
+exec_prefix=${prefix}/bin
|
|
+libdir=@LIB_INSTALL_DIR@
|
|
+includedir=@INCLUDE_INSTALL_DIR@
|
|
+
|
|
+Name: @APPLICATION_NAME@_threads
|
|
Description: The SSH Library Thread Extension
|
|
-Version: ${APPLICATION_VERSION}
|
|
-Libs: -L${LIB_INSTALL_DIR} -lssh_threads
|
|
-Cflags: -I${INCLUDE_INSTALL_DIR}
|
|
+Version: @APPLICATION_VERSION@
|
|
+Libs: -L${libdir} -lssh_threads
|
|
+Cflags: -I${includedir}
|
|
|