diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-04-20 22:45:48 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-04-20 22:45:48 (GMT) |
| commit | f862b7212d7e395a8b44639ebfb3eccd9f38ead7 (patch) | |
| tree | 3b15ad1b9f72e0d71513c94d136635fdc1a0d8fe /src/openscenegraph-1-pkg-config.patch | |
| parent | 734d34653d04f8e816d69830a53a056c43ffcd86 (diff) | |
| download | mxe-f862b7212d7e395a8b44639ebfb3eccd9f38ead7.zip mxe-f862b7212d7e395a8b44639ebfb3eccd9f38ead7.tar.gz mxe-f862b7212d7e395a8b44639ebfb3eccd9f38ead7.tar.bz2 | |
upgrade package: openscenegraph (by Martin Lambers)
Diffstat (limited to 'src/openscenegraph-1-pkg-config.patch')
| -rw-r--r-- | src/openscenegraph-1-pkg-config.patch | 85 |
1 files changed, 42 insertions, 43 deletions
diff --git a/src/openscenegraph-1-pkg-config.patch b/src/openscenegraph-1-pkg-config.patch index 9c418e6..ed1f987 100644 --- a/src/openscenegraph-1-pkg-config.patch +++ b/src/openscenegraph-1-pkg-config.patch @@ -1,49 +1,48 @@ This file is part of mingw-cross-env. See doc/index.html for further information. -diff -uNr OpenSceneGraph-2.8.2.orig/CMakeLists.txt OpenSceneGraph-2.8.2/CMakeLists.txt ---- OpenSceneGraph-2.8.2.orig/CMakeLists.txt 2009-07-28 08:02:27.000000000 +0200 -+++ OpenSceneGraph-2.8.2/CMakeLists.txt 2010-01-17 16:58:31.000000000 +0100 -@@ -774,12 +774,34 @@ - - # Generate pkg-config configuration file - --CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openscenegraph.pc.in -- ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc -+SET(PKGCONFIG_FILES -+ openscenegraph -+ openscenegraph-osg -+ openscenegraph-osgDB -+ openscenegraph-osgFX -+ openscenegraph-osgGA -+ openscenegraph-osgParticle -+ openscenegraph-osgSim -+ openscenegraph-osgText -+ openscenegraph-osgUtil -+ openscenegraph-osgTerrain -+ openscenegraph-osgManipulator -+ openscenegraph-osgViewer -+ openscenegraph-osgWidget -+ openscenegraph-osgShadow -+ openscenegraph-osgAnimation -+ openscenegraph-osgVolume -+ openscenegraph-osgIntrospection -+ openscenegraph-osgPlugins -+) -+ -+FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES}) -+ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc.in -+ ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc - @ONLY - ) -- --INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev) -+ INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev) -+ENDFOREACH(PKGCONFIG_FILE) - - # Run this as late as possible so users can easier spot the message - IF (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local") -Binary files OpenSceneGraph-2.8.2.orig/osgstaticviewer.exe and OpenSceneGraph-2.8.2/osgstaticviewer.exe differ +diff -uNr OpenSceneGraph-2.8.3.orig/CMakeLists.txt OpenSceneGraph-2.8.3/CMakeLists.txt +--- OpenSceneGraph-2.8.3.orig/CMakeLists.txt 2010-04-01 11:02:54.000000000 +0200 ++++ OpenSceneGraph-2.8.3/CMakeLists.txt 2010-04-20 07:41:05.000000000 +0200 +@@ -779,12 +779,34 @@ +
+ # Generate pkg-config configuration file
+
+-CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openscenegraph.pc.in
+- ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc
++SET(PKGCONFIG_FILES
++ openscenegraph
++ openscenegraph-osg
++ openscenegraph-osgDB
++ openscenegraph-osgFX
++ openscenegraph-osgGA
++ openscenegraph-osgParticle
++ openscenegraph-osgSim
++ openscenegraph-osgText
++ openscenegraph-osgUtil
++ openscenegraph-osgTerrain
++ openscenegraph-osgManipulator
++ openscenegraph-osgViewer
++ openscenegraph-osgWidget
++ openscenegraph-osgShadow
++ openscenegraph-osgAnimation
++ openscenegraph-osgVolume
++ openscenegraph-osgIntrospection
++ openscenegraph-osgPlugins
++)
++
++FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES})
++ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc.in
++ ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc
+ @ONLY
+ )
+-
+-INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)
++ INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)
++ENDFOREACH(PKGCONFIG_FILE)
+
+ # Run this as late as possible so users can easier spot the message
+ IF (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in --- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in 2010-01-17 16:58:31.000000000 +0100 |