diff -r fa096fb04b24 -r b08cafb86797 tools/CMakeLists.txt --- a/tools/CMakeLists.txt Tue Nov 24 20:40:08 2009 +0000 +++ b/tools/CMakeLists.txt Wed Nov 25 04:27:53 2009 +0000 @@ -1,38 +1,43 @@ if (NOT APPLE) -CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) + CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY) -ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") + ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") endif() if (APPLE AND BUNDLE) -find_package(OGGVORBIS REQUIRED) -find_package(SPARKLE) -find_program(macdeployqt_EXE NAMES macdeployqt macdeployqt-mac) + find_package(Qt4 REQUIRED) + find_package(SDL REQUIRED) + find_package(SDL_image REQUIRED) + find_package(SDL_net REQUIRED) + find_package(SDL_ttf REQUIRED) + find_package(SDL_mixer REQUIRED) + find_package(OGGVORBIS REQUIRED) + find_package(SPARKLE) + find_program(macdeployqt_EXE NAMES macdeployqt macdeployqt-mac) -if(NOT macdeployqt_EXE) - message(FATAL_ERROR "The utility macdeployqt is required to create the bundle!") -endif() - -#dummy target, we're interested in the postscript -add_custom_target(bundle) + if(NOT macdeployqt_EXE) + message(FATAL_ERROR "The utility macdeployqt is required to create the bundle!") + endif() -set_target_properties(bundle PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/CreateMacBundle.cmake) + #dummy target, we're interested in the postscript file + add_custom_target(bundle) -set(frameworks_dir ${bundle_name}/Contents/Frameworks/) + set_target_properties(bundle PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/CreateMacBundle.cmake) -string(REGEX REPLACE "(.*);-.*" "\\1" sdl_dir "${SDL_LIBRARY}") + set(frameworks_dir ${bundle_name}/Contents/Frameworks/) -if(SPARKLE_FOUND) - set(SPARKLE_FOUND 1) -else() - set(SPARKLE_FOUND 0) -endif() + string(REGEX REPLACE "(.*);-.*" "\\1" sdl_dir "${SDL_LIBRARY}") -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CreateMacBundle.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/CreateMacBundle.cmake) + if(SPARKLE_FOUND) + set(SPARKLE_FOUND 1) + else() + set(SPARKLE_FOUND 0) + endif() + + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CreateMacBundle.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/CreateMacBundle.cmake) endif(APPLE AND BUNDLE)