[mygui] Fix up mutlilib_cflags patch
Bruno Wolff III
bruno at fedoraproject.org
Mon Dec 10 13:20:00 UTC 2012
commit 25510858117cd8cd588c06e4b3c786b000c732aa
Author: Bruno Wolff III <bruno at wolff.to>
Date: Tue Dec 4 14:33:31 2012 -0600
Fix up mutlilib_cflags patch
mygui_multilib_cflags.patch | 149 ++++++++++++++++++++++---------------------
1 files changed, 76 insertions(+), 73 deletions(-)
---
diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch
index 4420ff9..9d45f04 100644
--- a/mygui_multilib_cflags.patch
+++ b/mygui_multilib_cflags.patch
@@ -1,74 +1,78 @@
---- CMakeLists.txt.orig 2011-01-03 01:50:52.000000000 -0600
-+++ CMakeLists.txt 2011-01-03 02:06:08.000000000 -0600
+--- CMakeLists.txt.multilib 2012-12-04 13:45:07.742668108 -0600
++++ CMakeLists.txt 2012-12-04 14:14:21.062506043 -0600
@@ -85,8 +85,8 @@
- set(MYGUI_LIBRARIES MyGUIEngine)
-
- # Specify build paths
--set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
--set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
-+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
-+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin)
- if (WIN32 OR APPLE)
- if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-@@ -139,18 +139,18 @@
- # Set compiler specific build flags
- if (CMAKE_COMPILER_IS_GNUCXX)
- add_definitions(-fdiagnostics-show-option)
-- add_definitions(-msse)
-+# add_definitions(-msse)
- if (MYGUI_RENDERSYSTEM EQUAL 2)
- # to avoid warnings from OGRE sources
-- add_definitions(-isystem ${OGRE_INCLUDE_DIR})
-+# add_definitions(-isystem ${OGRE_INCLUDE_DIR})
- endif ()
- # very interesting option, but way too many warnings
- #add_definitions(-Weffc++)
-- add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter)
-+# add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter)
- #add_definitions(-pedantic)
-
- # MyGUI_UString.h ignored from warnings because of this
-- add_definitions(-Wshadow)
-+# add_definitions(-Wshadow)
- endif ()
-
- if (MSVC)
---- CMake/ConfigureBuild.cmake.orig 2011-01-03 02:08:15.000000000 -0600
-+++ CMake/ConfigureBuild.cmake 2011-01-03 02:06:36.000000000 -0600
-@@ -44,7 +44,7 @@
- else ()
- configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
- endif ()
-- install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
-+ install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
-
- # configure additional packages
-
---- CMake/Utils/MyGUIConfigTargets.cmake.orig 2011-01-03 02:08:44.000000000 -0600
-+++ CMake/Utils/MyGUIConfigTargets.cmake 2011-01-03 02:12:12.000000000 -0600
-@@ -38,14 +38,14 @@
- function(mygui_install_target TARGETNAME SUFFIX)
- install(TARGETS ${TARGETNAME}
- RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
-- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
- FRAMEWORK DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
- )
- install(TARGETS ${TARGETNAME}
- RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
-- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
-- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
- FRAMEWORK DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
- )
- install(TARGETS ${TARGETNAME}
---- CMake/Templates/MYGUI.pc.in.orig 2011-01-03 02:12:38.000000000 -0600
-+++ CMake/Templates/MYGUI.pc.in 2011-01-03 02:15:43.000000000 -0600
-@@ -1,11 +1,12 @@
+ set(MYGUI_LIBRARIES MyGUIEngine)
+
+ # Specify build paths
+-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
+-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin)
+ if (WIN32 OR APPLE)
+ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+@@ -178,13 +178,13 @@
+
+ # Set compiler specific build flags
+ if (CMAKE_COMPILER_IS_GNUCXX)
+- add_definitions(-msse)
++# add_definitions(-msse)
+ if (NOT MYGUI_HIGH_LEVEL_WARNINGS)
+ add_definitions(-w)
+ else ()
+ if (MYGUI_RENDERSYSTEM EQUAL 2)
+ # to avoid warnings from OGRE
+- add_definitions(-isystem ${OGRE_INCLUDE_DIR})
++# add_definitions(-isystem ${OGRE_INCLUDE_DIR})
+ endif ()
+ if (MYGUI_SAMPLES_INPUT EQUAL 1 OR MYGUI_SAMPLES_INPUT EQUAL 3)
+ # to avoid warnings from OIS
+@@ -195,11 +195,11 @@
+ endif ()
+ # very interesting option, but way too many warnings
+ #add_definitions(-Weffc++)
+- add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter)
+- add_definitions(-pedantic)
++# add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter)
++# add_definitions(-pedantic)
+
+ # MyGUI_UString.h ignored from warnings because of this
+- add_definitions(-Wshadow)
++# add_definitions(-Wshadow)
+ endif ()
+ endif ()
+
+--- CMake/Utils/MyGUIConfigTargets.cmake.multilib 2012-12-04 13:45:07.745668489 -0600
++++ CMake/Utils/MyGUIConfigTargets.cmake 2012-12-04 14:19:27.623468365 -0600
+@@ -57,14 +57,14 @@
+ function(mygui_install_target TARGETNAME SUFFIX)
+ install(TARGETS ${TARGETNAME}
+ RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
+- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None ""
+ )
+ install(TARGETS ${TARGETNAME}
+ RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
+- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
+- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
+ FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo
+ )
+ install(TARGETS ${TARGETNAME}
+@@ -326,4 +326,4 @@
+ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
+ set_property(TARGET ${PROJECTNAME} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
+ endif ()
+-endfunction(mygui_config_sample)
+\ No newline at end of file
++endfunction(mygui_config_sample)
+--- CMake/Templates/MYGUI.pc.in.multilib 2012-12-04 13:45:07.747668743 -0600
++++ CMake/Templates/MYGUI.pc.in 2012-12-04 14:25:52.928438645 -0600
+@@ -1,11 +1,11 @@
prefix=@MYGUI_PREFIX_PATH@
exec_prefix=${prefix}
-libdir=${prefix}/lib
@@ -78,9 +82,8 @@
Name: MyGUI
Description: Fast, flexible and simple GUI
Version: @MYGUI_VERSION@
- URL: http://www.my-gui.sourceforge.net
+ URL: http://mygui.info
-Libs: -L${libdir} -lMyGUIEngine at MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@
-Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@
-+Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine at MYGUI_LIB_SUFFIX@ -lMyGUI.Ogr
-+ePlatform @MYGUI_ADDITIONAL_LIBS@
++Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine at MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@
+Cflags: -I${includedir} -I${includedir}/MyGUI @MYGUI_CFLAGS@
More information about the scm-commits
mailing list