diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2009-12-10 06:17:45 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2009-12-10 06:17:45 (GMT) |
| commit | 419d050bb528145431d115d83780847947ef475d (patch) | |
| tree | 4691a55bfd77cf4f996f2e2f4525cfd8ce83694e /Source/QtDialog | |
| parent | a082702d847eaed650d33639508f2811976e4451 (diff) | |
| download | CMake-419d050bb528145431d115d83780847947ef475d.zip CMake-419d050bb528145431d115d83780847947ef475d.tar.gz CMake-419d050bb528145431d115d83780847947ef475d.tar.bz2 | |
BUG: Fix bug #10,000.
Some fixes for including Qt frameworks.
Remove extra "QtGui.framework" so its not Contents/Frameworks/QtGui.framework/QtGui.framwork/... anymore.
Also include QtGui Resource folder, so a Cocoa/Qt based cmake-gui app works.
Diffstat (limited to 'Source/QtDialog')
| -rw-r--r-- | Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake b/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake index 37e4701..9f5cf00 100644 --- a/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake +++ b/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake @@ -210,7 +210,7 @@ macro(copy_library_into_bundle clib_bundle clib_libsrc clib_dstlibs clib_fixups) get_filename_component(fwdirname "${fw_srcdir}" NAME) string(REGEX REPLACE "^(.*)\\.framework$" "\\1" fwname "${fwdirname}") string(REGEX REPLACE "^.*/${fwname}\\.framework/(.*)$" "\\1" fwlibname "${clib_libsrc}") - set(fw_dstdir "${clib_bundle}/Contents/Frameworks/${fwdirname}") + set(fw_dstdir "${clib_bundle}/Contents/Frameworks") # message("") # message("fwdirname: '${fwdirname}'") @@ -240,17 +240,25 @@ macro(copy_library_into_bundle clib_bundle clib_libsrc clib_dstlibs clib_fixups) "${fw_src}" "${fw_dstdir}/${fwlibname}" ) + get_filename_component(fw_src_path "${fw_src}" PATH) + message("Checking ${fw_src_path}/Resources") + if(EXISTS "${fw_src_path}/Resources") + message("Copy: ${CMAKE_COMMAND} -E copy_directory \"${fw_src_path}/Resources/\" \"${fw_dstdir}/Resources/\"") + execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory + "${fw_src_path}/Resources/" "${fw_dstdir}/${fwdirname}/Resources/") + endif(EXISTS "${fw_src_path}/Resources") + execute_process(COMMAND install_name_tool - -id "@executable_path/../Frameworks/${fwdirname}/${fwlibname}" - "${clib_bundle}/Contents/Frameworks/${fwdirname}/${fwlibname}" + -id "@executable_path/../Frameworks/${fwlibname}" + "${clib_bundle}/Contents/Frameworks/${fwlibname}" ) set(${clib_dstlibs} ${${clib_dstlibs}} - "${clib_bundle}/Contents/Frameworks/${fwdirname}/${fwlibname}" + "${clib_bundle}/Contents/Frameworks/${fwlibname}" ) set(${clib_fixups} ${${clib_fixups}} "-change" "${clib_libsrc}" - "@executable_path/../Frameworks/${fwdirname}/${fwlibname}" + "@executable_path/../Frameworks/${fwlibname}" ) else("${clib_libsrc}" MATCHES ".framework/.*/.*/.*") if("${clib_libsrc}" MATCHES "/") |