4a5143c062
Build MyGUI 3.20 OBS-URL: https://build.opensuse.org/request/show/107048 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=9
59 lines
3.1 KiB
Diff
59 lines
3.1 KiB
Diff
diff -Naur MyGUI_3.2.0.orig/CMake/ConfigureBuild.cmake MyGUI_3.2.0/CMake/ConfigureBuild.cmake
|
|
--- MyGUI_3.2.0.orig/CMake/ConfigureBuild.cmake 2012-02-22 22:27:34.000000000 +0100
|
|
+++ MyGUI_3.2.0/CMake/ConfigureBuild.cmake 2012-02-26 16:03:12.000000000 +0100
|
|
@@ -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
|
|
|
|
diff -Naur MyGUI_3.2.0.orig/CMake/Utils/MyGUIConfigTargets.cmake MyGUI_3.2.0/CMake/Utils/MyGUIConfigTargets.cmake
|
|
--- MyGUI_3.2.0.orig/CMake/Utils/MyGUIConfigTargets.cmake 2012-02-22 22:27:34.000000000 +0100
|
|
+++ MyGUI_3.2.0/CMake/Utils/MyGUIConfigTargets.cmake 2012-02-26 16:05:06.000000000 +0100
|
|
@@ -57,8 +57,8 @@
|
|
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}
|
|
@@ -84,8 +84,8 @@
|
|
# setup common target settings
|
|
function(mygui_config_common TARGETNAME)
|
|
set_target_properties(${TARGETNAME} PROPERTIES
|
|
- ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
|
|
- LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
|
|
+ ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
|
|
+ LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
|
|
RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin
|
|
)
|
|
mygui_create_vcproj_userfile(${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)
|
|
diff -Naur MyGUI_3.2.0.orig/CMakeLists.txt MyGUI_3.2.0/CMakeLists.txt
|
|
--- MyGUI_3.2.0.orig/CMakeLists.txt 2012-02-22 22:28:40.000000000 +0100
|
|
+++ MyGUI_3.2.0/CMakeLists.txt 2012-02-26 16:05:47.000000000 +0100
|
|
@@ -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)
|