[Cmake-commits] [cmake-commits] clinton committed CMakeIngestOSXBundleLibraries.cmake 1.3 1.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Dec 10 01:17:51 EST 2009
Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv26871
Modified Files:
CMakeIngestOSXBundleLibraries.cmake
Log Message:
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.
Index: CMakeIngestOSXBundleLibraries.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CMakeIngestOSXBundleLibraries.cmake 18 Feb 2008 19:51:43 -0000 1.3
--- CMakeIngestOSXBundleLibraries.cmake 10 Dec 2009 06:17:45 -0000 1.4
***************
*** 211,215 ****
string(REGEX REPLACE "^(.*)\\.framework$" "\\1" fwname "${fwdirname}")
string(REGEX REPLACE "^.*/${fwname}\\.framework/(.*)$" "\\1" fwlibname "${clib_libsrc}")
! set(fw_dstdir "${clib_bundle}/Contents/Frameworks/${fwdirname}")
# message("")
--- 211,215 ----
string(REGEX REPLACE "^(.*)\\.framework$" "\\1" fwname "${fwdirname}")
string(REGEX REPLACE "^.*/${fwname}\\.framework/(.*)$" "\\1" fwlibname "${clib_libsrc}")
! set(fw_dstdir "${clib_bundle}/Contents/Frameworks")
# message("")
***************
*** 241,255 ****
)
execute_process(COMMAND install_name_tool
! -id "@executable_path/../Frameworks/${fwdirname}/${fwlibname}"
! "${clib_bundle}/Contents/Frameworks/${fwdirname}/${fwlibname}"
)
set(${clib_dstlibs} ${${clib_dstlibs}}
! "${clib_bundle}/Contents/Frameworks/${fwdirname}/${fwlibname}"
)
set(${clib_fixups} ${${clib_fixups}}
"-change"
"${clib_libsrc}"
! "@executable_path/../Frameworks/${fwdirname}/${fwlibname}"
)
else("${clib_libsrc}" MATCHES ".framework/.*/.*/.*")
--- 241,263 ----
)
+ 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/${fwlibname}"
! "${clib_bundle}/Contents/Frameworks/${fwlibname}"
)
set(${clib_dstlibs} ${${clib_dstlibs}}
! "${clib_bundle}/Contents/Frameworks/${fwlibname}"
)
set(${clib_fixups} ${${clib_fixups}}
"-change"
"${clib_libsrc}"
! "@executable_path/../Frameworks/${fwlibname}"
)
else("${clib_libsrc}" MATCHES ".framework/.*/.*/.*")
More information about the Cmake-commits
mailing list