Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-07-28 10:47:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-07-28 10:58:47 +0300
commitad7e3c302ee5d7ce86c86228900b0e61e0afcffe (patch)
tree4c4e9c498daf25275c697acd2f1ac9cf24dc141b /CMakeLists.txt
parent33bac1f40140748c5f8b3e045ba77a9618ada6e4 (diff)
CMake: modify recent platform defaults
Now only disable Jack and NDof on OSX Also comment main block for platform checks
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt21
1 files changed, 14 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5654eb3289a..dd19d801a0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,26 +160,25 @@ option_defaults_init(
_init_GAMEENGINE
)
-# NOTE: for now use same defaults on all platforms...
-# in future we may want to tweak per-platform
-
# customize...
-if (1)
+if (UNIX AND NOT APPLE)
# some of these libraries are problematic on Linux
# disable less important dependencies by default
- set(_init_BUILDINFO OFF)
set(_init_CODEC_FFMPEG OFF)
set(_init_CYCLES_OSL OFF)
set(_init_IMAGE_OPENEXR OFF)
set(_init_IMAGE_REDCODE OFF)
set(_init_INPUT_NDOF OFF)
set(_init_JACK OFF)
- set(_init_LIBMV_SCHUR_SPECIALIZATION OFF)
set(_init_OPENCOLLADA OFF)
set(_init_OPENCOLORIO OFF)
set(_init_SDL OFF)
set(_init_FFTW3 OFF)
- set(_init_GAMEENGINE OFF)
+elseif(WIN32)
+ set(_init_JACK OFF)
+elseif(APPLE)
+ set(_init_INPUT_NDOF OFF)
+ set(_init_JACK OFF)
endif()
@@ -808,6 +807,14 @@ if(WITH_X11)
endif()
+
+# ----------------------------------------------------------------------------
+# Main Platform Checks
+#
+# - UNIX
+# - WIN32
+# - APPLE
+
if(UNIX AND NOT APPLE)
macro(find_package_wrapper)
if(WITH_STATIC_LIBS)