Changeset 9557

Timestamp:

01/27/09 16:34:28 (4 years ago)

Author:

robert

Message:

From Alberto Luaces, "I have modified CMakeLists.txt in order to make CMake fill the existent
openscenegraph.pc and openthreads.pc files with OSG's installation values.
Then I install those files into the expected path for pkg-config (this can
also be modified through PKG_CONFIG_PATH environment variable). Therefore
those of us who are using pkg-config for linking can easily select which
version of OSG we want to use."

Location:

OpenSceneGraph/trunk/packaging/pkgconfig

Files:

• openscenegraph.pc (modified) (2 diffs)
• openscenegraph.pc.in (added)
• openthreads.pc (modified) (1 diff)
• openthreads.pc.in (added)

OpenSceneGraph/trunk/packaging/pkgconfig/openscenegraph.pc

@@ -1 +1 @@
 # pkg-config source file
 
-prefix=/usr
+prefix=/usr/local
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/lib64
 includedir=${prefix}/include
 
@@ -11 +11 @@
 Requires: openthreads
 Conflicts:
-Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil -losgTerrain -losgManipulator -losgViewer -losgWidget
+Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil -losgTerrain -losgManipulator -losgViewer -losgWidget -losgShadow -losgAnimation -losgVolume
 Cflags: -I${includedir}

OpenSceneGraph/trunk/packaging/pkgconfig/openthreads.pc

@@ -1 +1 @@
 # pkg-config source file
 
-prefix=/usr
+prefix=/usr/local
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/lib64
 includedir=${prefix}/include