diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake index 9c6aad9..74fe84f 100644 --- a/CMake/ConfigureBuild.cmake +++ b/CMake/ConfigureBuild.cmake @@ -47,7 +47,7 @@ if (UNIX) 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 --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake index bba3f91..0f6d842 100644 --- a/CMake/Utils/MyGUIConfigTargets.cmake +++ b/CMake/Utils/MyGUIConfigTargets.cmake @@ -34,8 +34,8 @@ endif () 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} @@ -61,8 +61,8 @@ endfunction(mygui_install_target) # 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 ) endfunction(mygui_config_common) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35658d9..f94482f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,8 +81,8 @@ endif () 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)