3rdparty/ext_marble/marble-libs-install-mxe.patch

0001 diff --git a/CMakeLists.txt b/CMakeLists.txt
0002 index 92c50c2e2..c2652de7b 100644
0003 --- a/CMakeLists.txt
0004 +++ b/CMakeLists.txt
0005 @@ -204,7 +204,7 @@ elseif(APPLE)
0006        # for Mac OS X, everything is put inside an application bundle
0007        SET (CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/)
0008        # path for library references
0009 -      SET (CMAKE_INSTALL_NAME_DIR @executable_path/lib)
0010 +      SET (CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib)
0011        # install the Info.plist file
0012        install(FILES src/mac/Info.plist DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents)
0013        #SET (lib_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
0014 diff --git a/src/lib/astro/CMakeLists.txt b/src/lib/astro/CMakeLists.txt
0015 index 27c4e4f62..ead8ccda7 100644
0016 --- a/src/lib/astro/CMakeLists.txt
0017 +++ b/src/lib/astro/CMakeLists.txt
0018 @@ -73,7 +73,7 @@ endif()
0019
0020  if (APPLE)
0021      # TODO: find how to install & deploy library, headers and config files as bundle for development
0022 -    return()
0023 +#    return()
0024  endif()
0025
0026
0027 @@ -92,24 +92,24 @@ endif()
0028
0029  ########### CMake Config files ###############
0030
0031 -include(CMakePackageConfigHelpers)
0032 -
0033 -set(ASTRO_INSTALL_CMAKECONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${ASTRO_CMAKECONFIGNAME})
0034 -
0035 -configure_package_config_file(AstroConfig.cmake.in
0036 -    ${CMAKE_CURRENT_BINARY_DIR}/${ASTRO_CMAKECONFIGNAME}Config.cmake
0037 -    INSTALL_DESTINATION ${ASTRO_INSTALL_CMAKECONFIGDIR}
0038 -)
0039 -
0040 -install(FILES
0041 -    ${CMAKE_CURRENT_BINARY_DIR}/${ASTRO_CMAKECONFIGNAME}Config.cmake
0042 -    ${CMAKE_CURRENT_BINARY_DIR}/${ASTRO_CMAKECONFIGNAME}ConfigVersion.cmake
0043 -
0044 -    DESTINATION ${ASTRO_INSTALL_CMAKECONFIGDIR}
0045 -)
0046 -
0047 -install(
0048 -    EXPORT AstroTargets
0049 -    FILE ${ASTRO_CMAKECONFIGNAME}Targets.cmake
0050 -    DESTINATION ${ASTRO_INSTALL_CMAKECONFIGDIR}
0051 -)
0052 +#include(CMakePackageConfigHelpers)
0053 +#
0054 +#set(ASTRO_INSTALL_CMAKECONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${ASTRO_CMAKECONFIGNAME})
0055 +#
0056 +#configure_package_config_file(AstroConfig.cmake.in
0057 +#    ${CMAKE_CURRENT_BINARY_DIR}/${ASTRO_CMAKECONFIGNAME}Config.cmake
0058 +#    INSTALL_DESTINATION ${ASTRO_INSTALL_CMAKECONFIGDIR}
0059 +#)
0060 +#
0061 +#install(FILES
0062 +#    ${CMAKE_CURRENT_BINARY_DIR}/${ASTRO_CMAKECONFIGNAME}Config.cmake
0063 +#    ${CMAKE_CURRENT_BINARY_DIR}/${ASTRO_CMAKECONFIGNAME}ConfigVersion.cmake
0064 +#
0065 +#    DESTINATION ${ASTRO_INSTALL_CMAKECONFIGDIR}
0066 +#)
0067 +#
0068 +#install(
0069 +#    EXPORT AstroTargets
0070 +#    FILE ${ASTRO_CMAKECONFIGNAME}Targets.cmake
0071 +#    DESTINATION ${ASTRO_INSTALL_CMAKECONFIGDIR}
0072 +#)
0073 diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
0074 index 51691b61c..454b46ed5 100644
0075 --- a/src/lib/marble/CMakeLists.txt
0076 +++ b/src/lib/marble/CMakeLists.txt
0077 @@ -469,7 +469,7 @@ endif()
0078
0079  if (APPLE)
0080      # TODO: find how to install & deploy library, headers and config files as bundle for development
0081 -    return()
0082 +#    return()
0083  endif()
0084
0085  if (MARBLE_NO_WEBKITWIDGETS)
0086 @@ -649,27 +649,27 @@ install( FILES
0087
0088  ########### CMake Config files ###############
0089
0090 -include(CMakePackageConfigHelpers)
0091 -
0092 -set(MARBLE_INSTALL_CMAKECONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${MARBLE_CMAKECONFIGNAME})
0093 -
0094 -configure_package_config_file(MarbleConfig.cmake.in
0095 -    ${CMAKE_CURRENT_BINARY_DIR}/${MARBLE_CMAKECONFIGNAME}Config.cmake
0096 -    INSTALL_DESTINATION ${MARBLE_INSTALL_CMAKECONFIGDIR}
0097 -)
0098 -
0099 -install(FILES
0100 -    ${CMAKE_CURRENT_BINARY_DIR}/${MARBLE_CMAKECONFIGNAME}Config.cmake
0101 -    ${CMAKE_CURRENT_BINARY_DIR}/${MARBLE_CMAKECONFIGNAME}ConfigVersion.cmake
0102 -
0103 -    DESTINATION ${MARBLE_INSTALL_CMAKECONFIGDIR}
0104 -)
0105 -
0106 -install(
0107 -    EXPORT MarbleTargets
0108 -    FILE ${MARBLE_CMAKECONFIGNAME}Targets.cmake
0109 -    DESTINATION ${MARBLE_INSTALL_CMAKECONFIGDIR}
0110 -)
0111 +#include(CMakePackageConfigHelpers)
0112 +#
0113 +#set(MARBLE_INSTALL_CMAKECONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${MARBLE_CMAKECONFIGNAME})
0114 +#
0115 +#configure_package_config_file(MarbleConfig.cmake.in
0116 +#    ${CMAKE_CURRENT_BINARY_DIR}/${MARBLE_CMAKECONFIGNAME}Config.cmake
0117 +#    INSTALL_DESTINATION ${MARBLE_INSTALL_CMAKECONFIGDIR}
0118 +#)
0119 +#
0120 +#install(FILES
0121 +#    ${CMAKE_CURRENT_BINARY_DIR}/${MARBLE_CMAKECONFIGNAME}Config.cmake
0122 +#    ${CMAKE_CURRENT_BINARY_DIR}/${MARBLE_CMAKECONFIGNAME}ConfigVersion.cmake
0123 +#
0124 +#    DESTINATION ${MARBLE_INSTALL_CMAKECONFIGDIR}
0125 +#)
0126 +#
0127 +#install(
0128 +#    EXPORT MarbleTargets
0129 +#    FILE ${MARBLE_CMAKECONFIGNAME}Targets.cmake
0130 +#    DESTINATION ${MARBLE_INSTALL_CMAKECONFIGDIR}
0131 +#)
0132
0133  ########### Qt Pri file ###############
0134