Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- CMakeLists.txt.orig 2013-02-12 21:04:13.431193134 +0100
- +++ CMakeLists.txt 2013-02-13 23:28:58.880561209 +0100
- @@ -270,6 +270,8 @@
- option(WITH_BOOST "Enable features depending no boost" ON)
- +option(WITH_STRICT_DEP "Build strictly with external deps, failing when not found" OFF)
- +
- if(APPLE)
- cmake_minimum_required(VERSION 2.8.8)
- @@ -555,33 +558,68 @@
- if(WITH_IMAGE_OPENEXR)
- find_package_wrapper(OpenEXR) # our own module
- if(NOT OPENEXR_FOUND)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "OpenEXR not found.")
- + else()
- set(WITH_IMAGE_OPENEXR OFF)
- endif()
- endif()
- + endif()
- +
- + if(WITH_BULLET)
- + find_package_wrapper(Bullet) # our own module
- + if(NOT BULLET_FOUND)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "Bullet not found.")
- + endif()
- + endif()
- + endif()
- +
- + if(WITH_EIGEN)
- + find_package_wrapper(Eigen) # our own module
- + if(NOT EIGEN_FOUND)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "Eigen not found.")
- + endif()
- + endif()
- + endif()
- +
- if(WITH_IMAGE_OPENJPEG)
- find_package_wrapper(OpenJPEG)
- if(NOT OPENJPEG_FOUND)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "OpenJPEG not found.")
- + else()
- set(WITH_IMAGE_OPENJPEG OFF)
- endif()
- endif()
- + endif()
- if(WITH_IMAGE_TIFF)
- # XXX Linking errors with debian static tiff :/
- # find_package_wrapper(TIFF)
- find_package(TIFF)
- if(NOT TIFF_FOUND)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "Tiff not found.")
- + else()
- set(WITH_IMAGE_TIFF OFF)
- endif()
- endif()
- + endif()
- # Audio IO
- if(WITH_OPENAL)
- find_package_wrapper(OpenAL)
- if(NOT OPENAL_FOUND)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "OpenAl not found.")
- + else()
- set(WITH_OPENAL OFF)
- endif()
- endif()
- + endif()
- if(WITH_SDL)
- find_package_wrapper(SDL)
- @@ -593,24 +631,53 @@
- )
- # unset(SDLMAIN_LIBRARY CACHE)
- if(NOT SDL_FOUND)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "SDL not found.")
- + else()
- set(WITH_SDL OFF)
- endif()
- endif()
- + endif()
- if(WITH_JACK)
- find_package_wrapper(Jack)
- if(NOT JACK_FOUND)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "Jack not found.")
- + else()
- set(WITH_JACK OFF)
- endif()
- endif()
- + endif()
- +
- + # Compression
- + if(WITH_STRICT_DEP)
- + if(WITH_LZO)
- + find_package_wrapper(Lzo)
- + if(NOT LZO_FOUND)
- + message(FATAL_ERROR "Lzo not found.")
- + endif()
- + endif()
- +
- + if(WITH_LZMA)
- + find_package_wrapper(Lzma)
- + if(NOT LZMA_FOUND)
- + message(FATAL_ERROR "Lzma not found.")
- + endif()
- + endif()
- + endif()
- # Codecs
- if(WITH_CODEC_SNDFILE)
- find_package_wrapper(SndFile)
- if(NOT SNDFILE_FOUND)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "Sndfile not found.")
- + else()
- set(WITH_CODEC_SNDFILE OFF)
- endif()
- endif()
- + endif()
- if(WITH_CODEC_FFMPEG)
- set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
- @@ -633,9 +700,13 @@
- if(WITH_FFTW3)
- find_package_wrapper(Fftw3)
- if(NOT FFTW3_FOUND)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "FFTW3 not found.")
- + else()
- set(WITH_FFTW3 OFF)
- endif()
- endif()
- + endif()
- if(WITH_OPENCOLLADA)
- find_package_wrapper(OpenCOLLADA)
- @@ -643,22 +714,34 @@
- find_package_wrapper(XML2)
- find_package_wrapper(PCRE)
- else()
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "OpenCollada not found.")
- + else()
- set(WITH_OPENCOLLADA OFF)
- endif()
- endif()
- + endif()
- if(WITH_MEM_JEMALLOC)
- find_package_wrapper(JeMalloc)
- if(NOT JEMALLOC_FOUND)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "Jemalloc not found.")
- + else()
- set(WITH_MEM_JEMALLOC OFF)
- endif()
- endif()
- + endif()
- if (WITH_INPUT_NDOF)
- find_package_wrapper(Spacenav)
- if(NOT SPACENAV_FOUND)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "SpaceNav not found.")
- + else()
- set(WITH_INPUT_NDOF OFF)
- endif()
- + endif()
- # use generic names within blenders buildsystem.
- if(SPACENAV_FOUND)
- @@ -707,9 +790,13 @@
- if(NOT OPENIMAGEIO_FOUND)
- set(WITH_OPENIMAGEIO OFF)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "OpenImageIO not found, disabling WITH_CYCLES")
- + else()
- message(STATUS "OpenImageIO not found, disabling WITH_CYCLES")
- endif()
- endif()
- + endif()
- if(WITH_OPENCOLORIO)
- find_package_wrapper(OpenColorIO)
- @@ -720,9 +807,13 @@
- if(NOT OPENCOLORIO_FOUND)
- set(WITH_OPENCOLORIO OFF)
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "OpenColorIO not found")
- + else()
- message(STATUS "OpenColorIO not found")
- endif()
- endif()
- + endif()
- # XXX Maybe most of this section should go into an llvm module?
- if(WITH_LLVM)
- @@ -798,9 +889,13 @@
- message(STATUS "OSL library = ${OSL_LIBRARIES}")
- message(STATUS "OSL compiler = ${OSL_COMPILER}")
- else()
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "OSL not found")
- + else()
- message(STATUS "OSL not found")
- endif()
- endif()
- + endif()
- # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
- set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
- @@ -836,11 +931,13 @@
- if(NOT WITH_PYTHON_MODULE)
- # BSD's dont use libdl.so
- set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -ldl")
- + if(NOT WITH_STRICT_DEP)
- # binreloc is linux only
- set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
- set(WITH_BINRELOC ON)
- endif()
- endif()
- + endif()
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -pthread")
- @@ -964,9 +1061,13 @@
- if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
- set(OSL_FOUND TRUE)
- else()
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "OSL not found")
- + else()
- message(STATUS "OSL not found")
- endif()
- endif()
- + endif()
- if(MSVC)
- set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid psapi)
- @@ -1435,9 +1536,13 @@
- set(WITH_OPENAL ON)
- set(OPENAL_INCLUDE_DIR "${LIBDIR}/openal/include")
- else()
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "OpenAl not found")
- + else()
- set(WITH_OPENAL OFF)
- endif()
- endif()
- + endif()
- if(WITH_JACK)
- find_library(JACK_FRAMEWORK
- @@ -1705,9 +1810,13 @@
- if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
- set(OSL_FOUND TRUE)
- else()
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "OSL not found")
- + else()
- message(STATUS "OSL not found")
- endif()
- endif()
- + endif()
- set(EXETYPE MACOSX_BUNDLE)
- @@ -1807,11 +1916,16 @@
- if(WITH_SYSTEM_OPENJPEG)
- # dealt with above
- else()
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "Can't use nonsystem openjpeg")
- + else()
- set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg")
- add_definitions(-DOPJ_STATIC)
- endif()
- + endif()
- endif()
- +#redcode is allowed even WITH_STRICT_DEP as it's strictly a blender lib
- if(WITH_IMAGE_REDCODE)
- set(REDCODE ${CMAKE_SOURCE_DIR}/extern)
- set(REDCODE_INC ${REDCODE})
- @@ -1872,7 +1986,11 @@
- )
- else()
- # set(GLEW_LIBRARY "") # unused
- + if(WITH_STRICT_DEP)
- + message(FATAL_ERROR "Cant use nonsystem glew")
- + else()
- set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
- + endif()
- endif()
- @@ -2085,7 +2203,9 @@
- add_subdirectory(source)
- add_subdirectory(intern)
- -add_subdirectory(extern)
- +#if(NOT WITH_STRICT_DEP)
- + add_subdirectory(extern)
- +#endif()
- #-----------------------------------------------------------------------------
- @@ -2192,6 +2312,9 @@
- # debug
- message(STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}")
- + info_cfg_text("Build method:")
- + info_cfg_option(WITH_STRICT_DEP)
- +
- info_cfg_text("")
- message("${_config_msg}")
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement