forked from pool/MyGUI
55 lines
2.6 KiB
Diff
55 lines
2.6 KiB
Diff
|
Index: CMake/ConfigureBuild.cmake
|
||
|
|
===================================================================
|
||
|
|
--- CMake/ConfigureBuild.cmake (revision 2802)
|
||
|
|
+++ CMake/ConfigureBuild.cmake (working copy)
|
||
|
|
@@ -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
|
||
|
|
|
||
|
|
Index: CMake/Utils/MyGUIConfigTargets.cmake
|
||
|
|
===================================================================
|
||
|
|
--- CMake/Utils/MyGUIConfigTargets.cmake (revision 2802)
|
||
|
|
+++ CMake/Utils/MyGUIConfigTargets.cmake (working copy)
|
||
|
|
@@ -38,8 +38,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 "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
|
||
|
|
)
|
||
|
|
install(TARGETS ${TARGETNAME}
|
||
|
|
@@ -65,8 +65,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})
|
||
|
|
Index: CMakeLists.txt
|
||
|
|
===================================================================
|
||
|
|
--- CMakeLists.txt (revision 2802)
|
||
|
|
+++ CMakeLists.txt (working copy)
|
||
|
|
@@ -84,8 +84,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)
|