diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-29 12:11:35 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-29 12:11:35 +0200 |
| commit | dcef13a23c06398c0c9b3145c08b28d1110bc169 (patch) | |
| tree | df8d3227b3d71fdd356b3c1e69c62533d1759f72 /distribution/osx/CMakeLists.txt | |
| parent | 3e11d9c0e6173fce8a482efed8d7f965e8bd6dfa (diff) | |
| parent | 16e9630b79f0a7a90c6cedb6781175bb8b337dc1 (diff) | |
Merge tag 'upstream/4.3.0'
Upstream version 4.3.0
Diffstat (limited to 'distribution/osx/CMakeLists.txt')
| -rw-r--r-- | distribution/osx/CMakeLists.txt | 51 |
1 files changed, 5 insertions, 46 deletions
diff --git a/distribution/osx/CMakeLists.txt b/distribution/osx/CMakeLists.txt index 5269250..2561fae 100644 --- a/distribution/osx/CMakeLists.txt +++ b/distribution/osx/CMakeLists.txt @@ -3,53 +3,12 @@ GET_TARGET_PROPERTY(XTRKCAD_LOCATION xtrkcad LOCATION) CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/dependencies.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake" @ONLY) INSTALL(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake") -# Handle some external dependencies that can't be detected automatically ... -SET(MACPORTS_DIR "/opt/local" CACHE PATH "Root directory containing installed MacPort packages") -MARK_AS_ADVANCED(MACPORTS_DIR) - -INSTALL(DIRECTORY - ${MACPORTS_DIR}/lib/gtk-2.0 - DESTINATION lib - USE_SOURCE_PERMISSIONS - ) - -INSTALL(DIRECTORY - ${MACPORTS_DIR}/etc/gtk-2.0 - DESTINATION etc - USE_SOURCE_PERMISSIONS - ) - -INSTALL(DIRECTORY - ${MACPORTS_DIR}/lib/pango - DESTINATION lib - USE_SOURCE_PERMISSIONS - ) - -INSTALL(DIRECTORY - ${MACPORTS_DIR}/lib/gdk-pixbuf-2.0 - DESTINATION lib - USE_SOURCE_PERMISSIONS - ) - -INSTALL(FILES - ${MACPORTS_DIR}/etc/pango/pangorc - ${MACPORTS_DIR}/etc/pango/pango.modules - DESTINATION etc/pango - ) - -INSTALL(FILES - ${MACPORTS_DIR}/etc/fonts/fonts.conf - ${MACPORTS_DIR}/etc/fonts/fonts.dtd - DESTINATION etc/fonts - ) - -INSTALL(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/yosemite-fix/libxml2.2.dylib - ${CMAKE_CURRENT_SOURCE_DIR}/yosemite-fix/libz.1.dylib - ${CMAKE_CURRENT_SOURCE_DIR}/yosemite-fix/libiconv.2.dylib - DESTINATION lib -) # Generate bundles ... ADD_SUBDIRECTORY(bundle) +# Add replacement bundle technique ... +FILE(COPY gtk-bundle/ DESTINATION gtk-bundle ) + +ADD_SUBDIRECTORY(gtk-bundle) + |