CMake:

- WITH_LCMS added option, was supported in scons.
- commented web plugin option since its not maintained.
- some formatting changes and removed includes that are not needed for source/creator/CMakeLists.txt.

1 files changed, 99 insertions, 57 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7202ff9024c..ab525febc57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,54 +57,76 @@ SET(BLENDER_VERSION  2.5)
 
 #-----------------------------------------------------------------------------
 # Set default config options
-OPTION(WITH_PLAYER        "Build Player" OFF)
-OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
-OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
+
+# Blender internal features
 OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
+OPTION(WITH_LCMS          "Enable color correction with lcms" OFF)
+OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
+OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_ELBEEM        "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
+OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
+OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
+OPTION(WITH_PLAYER        "Build Player" OFF)
+# (unix defaults to OpenMP On)
+IF(UNIX AND NOT APPLE)
+	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
+ELSE()
+	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+ENDIF()
+
+# Image format support
 OPTION(WITH_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
 OPTION(WITH_TIFF          "Enable LibTIFF Support" ON)
 OPTION(WITH_DDS           "Enable DDS Support" ON)
+
+# Audio format support
 OPTION(WITH_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
-OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
-OPTION(WITH_SDL           "Enable SDL for sound and joystick support" ON)
-OPTION(WITH_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
-OPTION(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
-OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
-OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
-OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
 OPTION(WITH_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
-OPTION(WITH_LZO           "Enable fast LZO compression, used for pointcache" ON)
-OPTION(WITH_LZMA          "Enable best LZMA compression, used for pointcache" ON)
-OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
-OPTION(WITH_BUILDINFO     "Include extra build details" ON)
-OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
-OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" OFF) 
-
 IF(APPLE OR WIN32)
 	OPTION(WITH_QUICKTIME     "Enable Quicktime Support" OFF)
 ENDIF(APPLE OR WIN32)
 
-# Unix defaults to OpenMP On
-# Disable opencollada on non-apple unix because opencollada has no package for debian
+# 3D format support
+# disable opencollada on non-apple unix because opencollada has no package for debian
 IF(UNIX AND NOT APPLE)
-	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
 	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
 ELSE()
-	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
 	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
 ENDIF()
 
+# Sound output
+OPTION(WITH_SDL           "Enable SDL for sound and joystick support" ON)
+OPTION(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
+OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
+
+# Compression
+OPTION(WITH_LZO           "Enable fast LZO compression (used for pointcache)" ON)
+OPTION(WITH_LZMA          "Enable best LZMA compression, (used for pointcache)" ON)
+
+# Misc
+OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" OFF) 
+OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
+OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
+
 IF (APPLE)
 	OPTION(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
 	OPTION(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
 	OPTION(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
-ENDIF (APPLE)
+ENDIF(APPLE)
+
+IF(NOT WITH_BULLET AND WITH_GAMEENGINE)
+	MESSAGE("WARNING: WITH_GAMEENGINE needs WITH_BULLET")
+ENDIF(NOT WITH_BULLET AND WITH_GAMEENGINE)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
+# disabled for now, not supported
+# OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
+
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix: 
 #   cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
@@ -179,7 +201,6 @@ IF(UNIX AND NOT APPLE)
 		SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 	ENDIF(WITH_PYTHON)
 
-
 	IF(WITH_SDL)
 		FIND_PACKAGE(SDL)
 		# UNSET(SDLMAIN_LIBRARY CACHE)
@@ -203,13 +224,33 @@ IF(UNIX AND NOT APPLE)
 		SET(OPENEXR_LIB Half IlmImf Iex Imath)
 	ENDIF(WITH_OPENEXR)
 
+	IF(WITH_TIFF)
+		FIND_PACKAGE(TIFF)
+		IF(NOT TIFF_FOUND)
+			SET(WITH_TIFF OFF)
+		ENDIF(NOT TIFF_FOUND)
+	ENDIF(WITH_TIFF)
+
+	FIND_PACKAGE(JPEG REQUIRED)
+
+	FIND_PACKAGE(PNG REQUIRED)
+
+	FIND_PACKAGE(ZLIB REQUIRED)
+
+	IF(WITH_LCMS)
+		SET(LCMS /usr CACHE FILEPATH "LCMS directory")
+		SET(LCMS_INCLUDE_DIR ${LCMS}/include)
+		SET(LCMS_LIBRARY lcms)
+		SET(LCMS_LIBPATH ${LCMS}/lib)
+	ENDIF(WITH_LCMS)
+
 	IF(WITH_FFMPEG)
 		SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
 		SET(FFMPEG_INC ${FFMPEG}/include)
 		SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
 		SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 	ENDIF(WITH_FFMPEG)
-  
+
 	IF(WITH_FFTW3)
 		SET(FFTW3 /usr)
 		SET(FFTW3_INC ${FFTW3}/include)
@@ -222,19 +263,6 @@ IF(UNIX AND NOT APPLE)
 	SET(LIBSAMPLERATE_LIB samplerate)
 	SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
-	IF(WITH_TIFF)
-		FIND_PACKAGE(TIFF)
-		IF(NOT TIFF_FOUND)
-			SET(WITH_TIFF OFF)
-		ENDIF(NOT TIFF_FOUND)
-	ENDIF(WITH_TIFF)
-
-	FIND_PACKAGE(JPEG REQUIRED)
-
-	FIND_PACKAGE(PNG REQUIRED)
-
-	FIND_PACKAGE(ZLIB REQUIRED)
-
 	IF (WITH_OPENCOLLADA)
 		SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
 		SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
@@ -429,6 +457,8 @@ IF(WIN32)
 			SET(PCRE_LIB pcre)
 		ENDIF(WITH_OPENCOLLADA)
 		
+        # TODO: IF(WITH_LCMS)
+        
 		IF(WITH_FFMPEG)
 			SET(FFMPEG ${LIBDIR}/ffmpeg)
 			SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
@@ -632,10 +662,12 @@ IF(APPLE)
 		SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
 	ENDIF(PYTHON_VERSION MATCHES 3.1)
 
-	SET(GETTEXT ${LIBDIR}/gettext)
-	SET(GETTEXT_INC "${GETTEXT}/include")
-	SET(GETTEXT_LIB intl iconv)
-	SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+	IF(WITH_INTERNATIONAL)
+		SET(GETTEXT ${LIBDIR}/gettext)
+		SET(GETTEXT_INC "${GETTEXT}/include")
+		SET(GETTEXT_LIB intl iconv)
+		SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+	ENDIF(WITH_INTERNATIONAL)
   
 	IF(WITH_FFTW3)
 		SET(FFTW3 ${LIBDIR}/fftw3)
@@ -656,15 +688,21 @@ IF(APPLE)
 	SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
 	SET(FREETYPE_LIBRARY freetype)
 
-	SET(OPENEXR ${LIBDIR}/openexr)
-	SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
-	SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
-	SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
+	IF(WITH_OPENEXR)
+		SET(OPENEXR ${LIBDIR}/openexr)
+		SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
+		SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+		SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
+	ENDIF(WITH_OPENEXR)
 
-	SET(FFMPEG ${LIBDIR}/ffmpeg)
-	SET(FFMPEG_INC ${FFMPEG}/include)
-	SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg)
-	SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+    # TODO: IF(WITH_LCMS)
+
+	IF(WITH_FFMPEG)
+		SET(FFMPEG ${LIBDIR}/ffmpeg)
+		SET(FFMPEG_INC ${FFMPEG}/include)
+		SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg)
+		SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+	ENDIF(WITH_FFMPEG)
 
 	SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
 	SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
@@ -712,10 +750,12 @@ IF(APPLE)
 		SET(EXPAT_LIB)
 	ENDIF (WITH_OPENCOLLADA)
 
-	SET(SDL ${LIBDIR}/sdl)
-	SET(SDL_INCLUDE_DIR ${SDL}/include)
-	SET(SDL_LIBRARY SDL)
-	SET(SDL_LIBPATH ${SDL}/lib)
+	IF(WITH_SDL)
+		SET(SDL ${LIBDIR}/sdl)
+		SET(SDL_INCLUDE_DIR ${SDL}/include)
+		SET(SDL_LIBRARY SDL)
+		SET(SDL_LIBPATH ${SDL}/lib)
+	ENDIF(WITH_SDL)
 
 	SET(PNG "${LIBDIR}/png")
 	SET(PNG_INC "${PNG}/include")
@@ -725,10 +765,12 @@ IF(APPLE)
 	SET(JPEG_INC "${JPEG}/include")
 	SET(JPEG_LIBPATH ${JPEG}/lib)
 
-	SET(TIFF ${LIBDIR}/tiff)
-	SET(TIFF_INCLUDE_DIR ${TIFF}/include)
-	SET(TIFF_LIBRARY tiff)
-	SET(TIFF_LIBPATH ${TIFF}/lib)
+	IF(WITH_TIFF)
+		SET(TIFF ${LIBDIR}/tiff)
+		SET(TIFF_INCLUDE_DIR ${TIFF}/include)
+		SET(TIFF_LIBRARY tiff)
+		SET(TIFF_LIBPATH ${TIFF}/lib)
+	ENDIF(WITH_TIFF)
 
 	SET(EXETYPE MACOSX_BUNDLE)