FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Alan Dickinson, "I modified the CPack and CMake files to utilze the CMAKE_INSTALL_PREFIX when building RPM packages.

Browse Source 
I also modified the CMake and pkgconfig files to append the _POSTFIX extenstion based on the CMAKE_BUILD_TYPE.

Additionally I fixed packaging/ld.so.conf.d/openscenegraph.conf.in to add a '/' betweeen the arguments since the CMAKE_INSTALL_PREFIX can't end with a '/'.
"
This commit is contained in:
Robert Osfield
2011-03-11 10:18:43 +00:00
parent 6055e3492a
commit d33d8c5626
21 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/ld.so.conf.d/openscenegraph.conf.in
View File

@@ -1,2 +1,2 @@
# openscenegraph library configuration
${CMAKE_INSTALL_PREFIX}lib${LIB_POSTFIX}
${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}

2
packaging/pkgconfig/openscenegraph-osg.pc.in
View File

@@ -10,5 +10,5 @@ Description: 3D scenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openthreads
Conflicts:
Libs: -L${libdir} -losg
Libs: -L${libdir} -losg@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgAnimation.pc.in
View File

@@ -10,5 +10,5 @@ Description: Skinning and morphing library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osg openscenegraph-osgText openscenegraph-osgGA openscenegraph-osgViewer openthreads
Conflicts:
Libs: -L${libdir} -losgAnimation
Libs: -L${libdir} -losgAnimation@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgDB.pc.in
View File

@@ -10,5 +10,5 @@ Description: File format reading library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgDB
Libs: -L${libdir} -losgDB@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgFX.pc.in
View File

@@ -10,5 +10,5 @@ Description: Special effects library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgFX
Libs: -L${libdir} -losgFX@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgGA.pc.in
View File

@@ -10,5 +10,5 @@ Description: GUI event library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgGA
Libs: -L${libdir} -losgGA@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgManipulator.pc.in
View File

@@ -10,5 +10,5 @@ Description: Manipulator library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osgUtil openscenegraph-osgGA openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgManipulator
Libs: -L${libdir} -losgManipulator@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgParticle.pc.in
View File

@@ -10,5 +10,5 @@ Description: Particle system library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgParticle
Libs: -L${libdir} -losgParticle@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgQt.pc.in
View File

@@ -10,5 +10,5 @@ Description: osgQt utility library.
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osgWidget openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgQt
Libs: -L${libdir} -losgQt@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgShadow.pc.in
View File

@@ -10,5 +10,5 @@ Description: Shadow techniques library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osgUtil openscenegraph-osgDB openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgShadow
Libs: -L${libdir} -losgShadow@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgSim.pc.in
View File

@@ -10,5 +10,5 @@ Description: Simulator utility library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osgText openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgSim
Libs: -L${libdir} -losgSim@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgTerrain.pc.in
View File

@@ -10,5 +10,5 @@ Description: Terrain library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osgUtil openscenegraph-osgDB openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgTerrain
Libs: -L${libdir} -losgTerrain@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgText.pc.in
View File

@@ -10,5 +10,5 @@ Description: Text rendering library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osgDB openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgText
Libs: -L${libdir} -losgText@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgUtil.pc.in
View File

@@ -10,5 +10,5 @@ Description: Utility library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgUtil
Libs: -L${libdir} -losgUtil@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgViewer.pc.in
View File

@@ -10,5 +10,5 @@ Description: Windowing system setup, thread scene manager library for Opensceneg
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osgText openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osgGA openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgViewer
Libs: -L${libdir} -losgViewer@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgVolume.pc.in
View File

@@ -10,5 +10,5 @@ Description: Volume library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osgUtil openscenegraph-osgDB openscenegraph-osgGA openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgVolume
Libs: -L${libdir} -losgVolume@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openscenegraph-osgWidget.pc.in
View File

@@ -10,5 +10,5 @@ Description: Windowing toolkit library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osgText openscenegraph-osgViewer openscenegraph-osgDB openscenegraph-osgGA openscenegraph-osg openthreads
Conflicts:
Libs: -L${libdir} -losgWidget
Libs: -L${libdir} -losgWidget@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

16
packaging/pkgconfig/openscenegraph.pc.in
View File

@@ -10,5 +10,19 @@ Description: 3D scenegraph
Version: @OPENSCENEGRAPH_VERSION@
Requires: openthreads
Conflicts:
Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil -losgTerrain -losgManipulator -losgViewer -losgWidget -losgShadow -losgAnimation -losgVolume
Libs: -L${libdir} -losg@CMAKE_BUILD_POSTFIX@ \
-losgDB@CMAKE_BUILD_POSTFIX@ \
-losgFX@CMAKE_BUILD_POSTFIX@ \
-losgGA@CMAKE_BUILD_POSTFIX@ \
-losgParticle@CMAKE_BUILD_POSTFIX@ \
-losgSim@CMAKE_BUILD_POSTFIX@ \
-losgText@CMAKE_BUILD_POSTFIX@ \
-losgUtil@CMAKE_BUILD_POSTFIX@ \
-losgTerrain@CMAKE_BUILD_POSTFIX@ \
-losgManipulator@CMAKE_BUILD_POSTFIX@ \
-losgViewer@CMAKE_BUILD_POSTFIX@ \
-losgWidget@CMAKE_BUILD_POSTFIX@ \
-losgShadow@CMAKE_BUILD_POSTFIX@ \
-losgAnimation@CMAKE_BUILD_POSTFIX@ \
-losgVolume@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}

2
packaging/pkgconfig/openthreads.pc.in
View File

@@ -10,5 +10,5 @@ Description: Object-Oriented (OO) thread interface for C++ programmers
Version: @OPENTHREADS_VERSION@
Requires:
Conflicts:
Libs: -L${libdir} -lOpenThreads
Libs: -L${libdir} -lOpenThreads@CMAKE_BUILD_POSTFIX@
Cflags: -I${includedir}