From 54866e4250cbfd617d2665bdbc9bba44efd677a9 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Sun, 11 Oct 2015 13:07:59 +0300 Subject: [PATCH] cmake/backbone submodule updated, pkg-config fixed. --- cmake/backbone | 2 +- pkg-config/CMakeLists.txt | 23 +---------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/cmake/backbone b/cmake/backbone index 0b0ae29..82708ba 160000 --- a/cmake/backbone +++ b/cmake/backbone @@ -1 +1 @@ -Subproject commit 0b0ae29b87b4e0cb884cc1f8d2c50d3d632ff77f +Subproject commit 82708ba51466d02bb113e1e1aa258aef8f8bc38a diff --git a/pkg-config/CMakeLists.txt b/pkg-config/CMakeLists.txt index 54f5566..a1c4dfb 100644 --- a/pkg-config/CMakeLists.txt +++ b/pkg-config/CMakeLists.txt @@ -1,22 +1 @@ -# configure pkg-config file -IF (WIN32) - SET (PkgConfigPrefix "") -ELSE () - SET (PkgConfigPrefix ${CMAKE_INSTALL_PREFIX}) -ENDIF () -SET (PkgConfigExecPrefix "\${prefix}") -SET (PkgConfigLibDir "\${exec_prefix}/lib") -SET (PkgConfigIncludeDir "\${prefix}/include") - -SET (PkgConfigName "${CMAKE_PROJECT_NAME}") -SET (PkgConfigDescription "${PROJECT_DESCRIPTION}") -SET (PkgConfigVersion "${MAJOR}.${MINOR}.${PATCH}") -SET (PkgConfigLibs "-L\${libdir}") -SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}.so.${MAJOR}") -SET (PkgConfigLibsPrivate "") -SET (PkgConfigCflags "") - -CONFIGURE_FILE ( - "${CMAKE_CURRENT_SOURCE_DIR}/pkg-config.pc.in" - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_LOWERCASE_NAME}-${MAJOR}.pc" -) +INCLUDE (PkgConfigCommon)