# HG changeset patch # User koda # Date 1433266660 -3600 # Node ID a017ec64f675249ab5441e963119395d12eee469 # Parent 0f4b387224006dfd89ea9e9e04107628230a5124 Allow skipping the bundle step after install on OSX diff -r 0f4b38722400 -r a017ec64f675 CMakeLists.txt --- a/CMakeLists.txt Tue Jun 02 01:58:10 2015 +0100 +++ b/CMakeLists.txt Tue Jun 02 18:37:40 2015 +0100 @@ -32,6 +32,7 @@ option(MINIMAL_FLAGS "Respect system flags as much as possible (off)" OFF) option(NOAUTOUPDATE "Disable OS X Sparkle update checking (off)" OFF) +option(SKIPBUNDLE "Do not create relocate bundle (off)" OFF) option(BUILD_ENGINE_C "Compile hwengine as native C (off)" OFF) option(GL2 "Enable OpenGL 2 rendering !!!EXPERIMENTAL - DO NOT USE!!! [default: off)" OFF) diff -r 0f4b38722400 -r a017ec64f675 tools/CMakeLists.txt --- a/tools/CMakeLists.txt Tue Jun 02 01:58:10 2015 +0100 +++ b/tools/CMakeLists.txt Tue Jun 02 18:37:40 2015 +0100 @@ -6,7 +6,7 @@ add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") endif() -if(APPLE) +if(APPLE AND NOT SKIPBUNDLE) find_package(Qt4 REQUIRED QUIET) find_package(SDL REQUIRED) find_package(SDL_image REQUIRED)