From 7e5502b38cd22262f206080fd752690b7704446b Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 9 Jun 2010 18:09:56 +0200 Subject: [PATCH] Changed: #842 Added pkg-config files --- code/nel/src/3d/CMakeLists.txt | 2 ++ code/nel/src/3d/nel-3d.pc.in | 4 ++-- code/nel/src/georges/CMakeLists.txt | 2 ++ code/nel/src/georges/nel-georges.pc.in | 12 ++++++++++++ code/nel/src/ligo/CMakeLists.txt | 2 ++ code/nel/src/ligo/nel-ligo.pc.in | 12 ++++++++++++ code/nel/src/misc/CMakeLists.txt | 2 ++ code/nel/src/misc/nel-misc.pc.in | 4 ++-- code/nel/src/net/CMakeLists.txt | 2 ++ code/nel/src/net/nel-net.pc.in | 12 ++++++++++++ code/nel/src/pacs/CMakeLists.txt | 2 ++ code/nel/src/pacs/nel-pacs.pc.in | 12 ++++++++++++ code/nel/src/sound/CMakeLists.txt | 2 ++ code/nel/src/sound/nel-sound.pc.in | 12 ++++++++++++ 14 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 code/nel/src/georges/nel-georges.pc.in create mode 100644 code/nel/src/ligo/nel-ligo.pc.in create mode 100644 code/nel/src/net/nel-net.pc.in create mode 100644 code/nel/src/pacs/nel-pacs.pc.in create mode 100644 code/nel/src/sound/nel-sound.pc.in diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt index 02d8e368a..a48f25c49 100644 --- a/code/nel/src/3d/CMakeLists.txt +++ b/code/nel/src/3d/CMakeLists.txt @@ -664,6 +664,8 @@ 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) ELSE(NOT WIN32) ADD_LIBRARY(nel3d STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/3d/nel-3d.pc.in b/code/nel/src/3d/nel-3d.pc.in index fe31bd8f8..ade3e2d08 100644 --- a/code/nel/src/3d/nel-3d.pc.in +++ b/code/nel/src/3d/nel-3d.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ Name: nel-3d -Version: @VERSION@ -Description: NeL @VERSION@ +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ Reqiures: Libs: -L${libdir} Libs.private: @LIBS@ @FREETYPE_LIBS@ -lc diff --git a/code/nel/src/georges/CMakeLists.txt b/code/nel/src/georges/CMakeLists.txt index 7efb0d037..bb97967be 100644 --- a/code/nel/src/georges/CMakeLists.txt +++ b/code/nel/src/georges/CMakeLists.txt @@ -6,6 +6,8 @@ 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) ELSE(NOT WIN32) ADD_LIBRARY(nelgeorges STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/georges/nel-georges.pc.in b/code/nel/src/georges/nel-georges.pc.in new file mode 100644 index 000000000..4aa509aa0 --- /dev/null +++ b/code/nel/src/georges/nel-georges.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nel-georges +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ +Reqiures: +Libs: -L${libdir} +Libs.private: @LIBS@ -lc +Cflags: -I${includedir} diff --git a/code/nel/src/ligo/CMakeLists.txt b/code/nel/src/ligo/CMakeLists.txt index 30402c9e0..3f445121d 100644 --- a/code/nel/src/ligo/CMakeLists.txt +++ b/code/nel/src/ligo/CMakeLists.txt @@ -2,6 +2,8 @@ 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) ELSE(NOT WIN32) ADD_LIBRARY(nelligo STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/ligo/nel-ligo.pc.in b/code/nel/src/ligo/nel-ligo.pc.in new file mode 100644 index 000000000..d4a535bac --- /dev/null +++ b/code/nel/src/ligo/nel-ligo.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nel-ligo +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ +Reqiures: +Libs: -L${libdir} +Libs.private: @LIBS@ -lc +Cflags: -I${includedir} diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index 45a619466..540f6a740 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -2,6 +2,8 @@ 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) ELSE(NOT WIN32) ADD_LIBRARY(nelmisc STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/misc/nel-misc.pc.in b/code/nel/src/misc/nel-misc.pc.in index 9e10a2beb..c4d447c42 100644 --- a/code/nel/src/misc/nel-misc.pc.in +++ b/code/nel/src/misc/nel-misc.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ Name: nel-misc -Version: @VERSION@ -Description: NeL @VERSION@ +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ Reqiures: Libs: -L${libdir} Libs.private: @LIBS@ -lc -lpthread -lrt -ldl diff --git a/code/nel/src/net/CMakeLists.txt b/code/nel/src/net/CMakeLists.txt index 388933c44..b77310bf8 100644 --- a/code/nel/src/net/CMakeLists.txt +++ b/code/nel/src/net/CMakeLists.txt @@ -9,6 +9,8 @@ SET(NLNET_LIB ${LIBNAME}) IF(NOT WIN32) ADD_LIBRARY(nelnet SHARED ${SRC}) + CONFIGURE_FILE(nel-net.pc.in nel-net.pc) + INSTALL(FILES nel-net.pc DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nelnet STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/net/nel-net.pc.in b/code/nel/src/net/nel-net.pc.in new file mode 100644 index 000000000..0fb2a0462 --- /dev/null +++ b/code/nel/src/net/nel-net.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nel-net +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ +Reqiures: +Libs: -L${libdir} +Libs.private: @LIBS@ -lc -lpthread -lrt -ldl +Cflags: -I${includedir} -lc -lpthread -lrt -ldl diff --git a/code/nel/src/pacs/CMakeLists.txt b/code/nel/src/pacs/CMakeLists.txt index 3cfdb7a85..910396cfd 100644 --- a/code/nel/src/pacs/CMakeLists.txt +++ b/code/nel/src/pacs/CMakeLists.txt @@ -2,6 +2,8 @@ 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) ELSE(NOT WIN32) ADD_LIBRARY(nelpacs STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/pacs/nel-pacs.pc.in b/code/nel/src/pacs/nel-pacs.pc.in new file mode 100644 index 000000000..133b51d53 --- /dev/null +++ b/code/nel/src/pacs/nel-pacs.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nel-pacs +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ +Reqiures: +Libs: -L${libdir} +Libs.private: @LIBS@ -lc -lpthread -lrt -ldl +Cflags: -I${includedir} -lc -lpthread -lrt -ldl diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt index 63f21b127..d26e59c1e 100644 --- a/code/nel/src/sound/CMakeLists.txt +++ b/code/nel/src/sound/CMakeLists.txt @@ -8,6 +8,8 @@ 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) ELSE(NOT WIN32) ADD_LIBRARY(nelsound STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/sound/nel-sound.pc.in b/code/nel/src/sound/nel-sound.pc.in new file mode 100644 index 000000000..9994e967e --- /dev/null +++ b/code/nel/src/sound/nel-sound.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nel-sound +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ +Reqiures: +Libs: -L${libdir} +Libs.private: @LIBS@ -lc -lpthread -lrt -ldl +Cflags: -I${includedir} -lc -lpthread -lrt -ldl