improve mac bundle creation 0.9.14.1
authorkoda
Sun, 14 Nov 2010 20:37:55 +0100
branch0.9.14.1
changeset 4335 c279aeb615df
parent 4334 82cfbbab73da
child 4336 006133b13b32
child 4337 85e02b1a8e8f
improve mac bundle creation
tools/CMakeLists.txt
tools/CreateMacBundle.cmake.in
--- a/tools/CMakeLists.txt	Sun Nov 14 20:06:47 2010 +0100
+++ b/tools/CMakeLists.txt	Sun Nov 14 20:37:55 2010 +0100
@@ -17,7 +17,10 @@
 	find_package(SDL_mixer REQUIRED)
 	find_package(OGGVORBIS REQUIRED)
 	find_package(SPARKLE)
-	find_program(macdeployqt_EXE NAMES macdeployqt macdeployqt-mac)
+
+	#use the associated tool from the libraries we've selected
+	string(REGEX REPLACE "(.*)/include;-.*" "\\1" qt_base_dir "${QT_INCLUDE_DIR}")
+	find_program(macdeployqt_EXE NAMES macdeployqt macdeployqt-mac PATH ${qt_base_dir})
 
 	if(NOT macdeployqt_EXE)
 		message(FATAL_ERROR "The utility macdeployqt is required to create the bundle!")
--- a/tools/CreateMacBundle.cmake.in	Sun Nov 14 20:06:47 2010 +0100
+++ b/tools/CreateMacBundle.cmake.in	Sun Nov 14 20:37:55 2010 +0100
@@ -1,3 +1,5 @@
+message(STATUS "Performing standalone bundle creation...")
+
 execute_process(COMMAND mkdir -p ${frameworks_dir})
 
 execute_process(COMMAND ${macdeployqt_EXE} ${CMAKE_BINARY_DIR}/${bundle_name} OUTPUT_QUIET ERROR_QUIET)