99 lines
4.6 KiB
Diff
99 lines
4.6 KiB
Diff
--- 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)
|
|
@@ -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 14:58:50.668799275 -0600
|
|
+++ CMake/Templates/MYGUI.pc.in 2012-12-04 15:02:40.398996802 -0600
|
|
@@ -1,11 +1,11 @@
|
|
prefix=@MYGUI_PREFIX_PATH@
|
|
exec_prefix=${prefix}
|
|
-libdir=${prefix}/lib
|
|
+libdir=${prefix}/lib@LIB_SUFFIX@
|
|
includedir=${prefix}/include
|
|
|
|
Name: MyGUI
|
|
Description: Fast, flexible and simple GUI
|
|
Version: @MYGUI_VERSION@
|
|
URL: http://mygui.info
|
|
-Libs: -L${libdir} -lMyGUIEngine@MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@
|
|
+Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine@MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@
|
|
Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@
|
|
--- CMake/ConfigureBuild.cmake.orig 2012-12-11 04:44:39.998238526 -0600
|
|
+++ CMake/ConfigureBuild.cmake 2012-12-11 04:45:26.291122114 -0600
|
|
@@ -47,7 +47,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
|
|
|