From 2a026c1d9e64522d8c93fb44f442972c19c92006 Mon Sep 17 00:00:00 2001 From: rti Date: Wed, 9 Jun 2010 23:41:54 +0200 Subject: [PATCH] Changed: #842 fixed *.pc install source paths --- code/nel/src/3d/CMakeLists.txt | 2 +- code/nel/src/georges/CMakeLists.txt | 2 +- code/nel/src/ligo/CMakeLists.txt | 2 +- code/nel/src/misc/CMakeLists.txt | 2 +- code/nel/src/pacs/CMakeLists.txt | 2 +- code/nel/src/sound/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt index a48f25c49..34fe8ac56 100644 --- a/code/nel/src/3d/CMakeLists.txt +++ b/code/nel/src/3d/CMakeLists.txt @@ -665,7 +665,7 @@ SOURCE_GROUP(Shadows FILES IF(NOT WIN32) ADD_LIBRARY(nel3d SHARED ${SRC}) CONFIGURE_FILE(nel-3d.pc.in nel-3d.pc) - INSTALL(FILES nel-3d.pc DESTINATION lib/pkgconfig) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/nel-3d.pc" DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nel3d STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/georges/CMakeLists.txt b/code/nel/src/georges/CMakeLists.txt index bb97967be..c3b4ee12c 100644 --- a/code/nel/src/georges/CMakeLists.txt +++ b/code/nel/src/georges/CMakeLists.txt @@ -7,7 +7,7 @@ SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) IF(NOT WIN32) ADD_LIBRARY(nelgeorges SHARED ${SRC}) CONFIGURE_FILE(nel-georges.pc.in nel-georges.pc) - INSTALL(FILES nel-georges.pc DESTINATION lib/pkgconfig) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/nel-georges.pc" DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nelgeorges STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/ligo/CMakeLists.txt b/code/nel/src/ligo/CMakeLists.txt index 3f445121d..43d5061b7 100644 --- a/code/nel/src/ligo/CMakeLists.txt +++ b/code/nel/src/ligo/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) IF(NOT WIN32) ADD_LIBRARY(nelligo SHARED ${SRC}) CONFIGURE_FILE(nel-ligo.pc.in nel-ligo.pc) - INSTALL(FILES nel-ligo.pc DESTINATION lib/pkgconfig) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/nel-ligo.pc" DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nelligo STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index 540f6a740..850b6a043 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h config_file/*.cpp config_file/*.h) IF(NOT WIN32) ADD_LIBRARY(nelmisc SHARED ${SRC}) CONFIGURE_FILE(nel-misc.pc.in nel-misc.pc) - INSTALL(FILES nel-misc.pc DESTINATION lib/pkgconfig) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/nel-misc.pc" DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nelmisc STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/pacs/CMakeLists.txt b/code/nel/src/pacs/CMakeLists.txt index 910396cfd..aacf96673 100644 --- a/code/nel/src/pacs/CMakeLists.txt +++ b/code/nel/src/pacs/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) IF(NOT WIN32) ADD_LIBRARY(nelpacs SHARED ${SRC}) CONFIGURE_FILE(nel-pacs.pc.in nel-pacs.pc) - INSTALL(FILES nel-pacs.pc DESTINATION lib/pkgconfig) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/nel-pacs.pc" DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nelpacs STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt index d26e59c1e..268ca9dc4 100644 --- a/code/nel/src/sound/CMakeLists.txt +++ b/code/nel/src/sound/CMakeLists.txt @@ -9,7 +9,7 @@ ENDIF(APPLE) IF(NOT WIN32) ADD_LIBRARY(nelsound SHARED ${SRC}) CONFIGURE_FILE(nel-sound.pc.in nel-sound.pc) - INSTALL(FILES nel-sound.pc DESTINATION lib/pkgconfig) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/nel-sound.pc" DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nelsound STATIC ${SRC}) ENDIF(NOT WIN32)