Mercurial Mercurial > hedgewars-draft / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow skipping the bundle step after install on OSX 0.9.21
authorkoda
Tue, 02 Jun 2015 18:37:40 +0100
branch0.9.21
changeset 10762 a017ec64f675
parent 10759 0f4b38722400
child 10765 7e55468ffe38
Allow skipping the bundle step after install on OSX
CMakeLists.txt file | annotate | diff | comparison | revisions
tools/CMakeLists.txt file | annotate | diff | comparison | revisions 
--- 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)
--- 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)
hedgewars-draft