diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-04-28 17:47:27 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-04-28 17:47:27 +0400 |
commit | 774584d7e84843503a5ef4477748cecfdaedeb3d (patch) | |
tree | 574506474a87223ccfa709113f9048f626071fb1 /intern/cycles/cmake | |
parent | d263fee9521c2a53f7b673c9a8c57c072bf072c1 (diff) |
Cycles: hook up the CMake build system.
New build instructions for Ubuntu Linux in the wiki:
http://wiki.blender.org/index.php/Dev:2.5/Source/Cycles
Diffstat (limited to 'intern/cycles/cmake')
-rwxr-xr-x | intern/cycles/cmake/create_dmg.py | 14 | ||||
-rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 90 | ||||
-rw-r--r-- | intern/cycles/cmake/platforms.cmake | 2 |
3 files changed, 28 insertions, 78 deletions
diff --git a/intern/cycles/cmake/create_dmg.py b/intern/cycles/cmake/create_dmg.py deleted file mode 100755 index bba7f8d3509..00000000000 --- a/intern/cycles/cmake/create_dmg.py +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/python - -import os -import string -import sys - -name = string.replace(sys.argv[1], ".zip", "") - -os.system("rm -f %s.dmg" % (name)) -os.system("mkdir -p /tmp/cycles_dmg") -os.system("rm /tmp/cycles_dmg/*") -os.system("cp %s.zip /tmp/cycles_dmg/" % (name)) -os.system("/usr/bin/hdiutil create -fs HFS+ -srcfolder /tmp/cycles_dmg -volname %s %s.dmg" % (name, name)) - diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index 6f6f00ed6bc..da2331cfe9a 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -1,8 +1,8 @@ ########################################################################### # Boost setup -MESSAGE(STATUS "BOOST_PATH ${BOOST_PATH}") -SET(BOOST_ROOT ${BOOST_PATH}) +MESSAGE(STATUS "CYCLES_BOOST ${CYCLES_BOOST}") +SET(BOOST_ROOT ${CYCLES_BOOST}) SET(Boost_ADDITIONAL_VERSIONS "1.45" "1.44" "1.43" "1.43.0" "1.42" "1.42.0" @@ -26,22 +26,22 @@ MESSAGE(STATUS "Boost libraries ${Boost_LIBRARIES}") INCLUDE_DIRECTORIES("${Boost_INCLUDE_DIRS}") LINK_DIRECTORIES("${Boost_LIBRARY_DIRS}") -IF(WITH_NETWORK) +IF(WITH_CYCLES_NETWORK) ADD_DEFINITIONS(-DWITH_NETWORK) ENDIF() -IF(WITH_MULTI) +IF(WITH_CYCLES_MULTI) ADD_DEFINITIONS(-DWITH_MULTI) ENDIF() ########################################################################### # OpenImageIO -MESSAGE(STATUS "OIIO_PATH = ${OIIO_PATH}") +MESSAGE(STATUS "CYCLES_OIIO = ${CYCLES_OIIO}") -FIND_LIBRARY(OPENIMAGEIO_LIBRARY NAMES OpenImageIO PATHS ${OIIO_PATH}/lib) -FIND_PATH(OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h ${OIIO_PATH}/include) -FIND_PROGRAM(OPENIMAGEIO_IDIFF NAMES idiff PATHS ${OIIO_PATH}/bin) +FIND_LIBRARY(OPENIMAGEIO_LIBRARY NAMES OpenImageIO PATHS ${CYCLES_OIIO}/lib) +FIND_PATH(OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h ${CYCLES_OIIO}/include) +FIND_PROGRAM(OPENIMAGEIO_IDIFF NAMES idiff PATHS ${CYCLES_OIIO}/bin) IF(OPENIMAGEIO_INCLUDES AND OPENIMAGEIO_LIBRARY) SET(OPENIMAGEIO_FOUND TRUE) @@ -55,17 +55,9 @@ ADD_DEFINITIONS(-DWITH_OIIO) INCLUDE_DIRECTORIES(${OPENIMAGEIO_INCLUDES} ${OPENIMAGEIO_INCLUDES}/OpenImageIO) ########################################################################### -# OpenGL - -FIND_PACKAGE(OpenGL) -MESSAGE(STATUS "OPENGL_FOUND=${OPENGL_FOUND}") - -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) - -########################################################################### # GLUT -SET(GLUT_ROOT_PATH ${GLUT_PATH}) +SET(GLUT_ROOT_PATH ${CYCLES_GLUT}) FIND_PACKAGE(GLUT) MESSAGE(STATUS "GLUT_FOUND=${GLUT_FOUND}") @@ -73,31 +65,15 @@ MESSAGE(STATUS "GLUT_FOUND=${GLUT_FOUND}") INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR}) ########################################################################### -# GLEW - -SET(GLEW_VERSION 1.5.1) -FIND_LIBRARY(GLEW_LIBRARIES NAMES GLEW PATHS ${GLEW_PATH}/lib) -FIND_PATH(GLEW_INCLUDES NAMES glew.h PATH_SUFFIXES GL PATHS ${GLEW_PATH}/include) - -IF(GLEW_INCLUDES AND GLEW_LIBRARIES) - MESSAGE(STATUS "GLEW includes = ${GLEW_INCLUDES}") - MESSAGE(STATUS "GLEW library = ${GLEW_LIBRARIES}") -ELSE() - MESSAGE(STATUS "GLEW not found") -ENDIF() - -INCLUDE_DIRECTORIES("${GLEW_INCLUDES}") - -########################################################################### # OpenShadingLanguage -IF(WITH_OSL) +IF(WITH_CYCLES_OSL) - MESSAGE(STATUS "OSL_PATH = ${OSL_PATH}") + MESSAGE(STATUS "CYCLES_OSL = ${CYCLES_OSL}") - FIND_LIBRARY(OSL_LIBRARIES NAMES oslexec oslcomp oslquery PATHS ${OSL_PATH}/lib) - FIND_PATH(OSL_INCLUDES OSL/oslclosure.h ${OSL_PATH}/include) - FIND_PROGRAM(OSL_COMPILER NAMES oslc PATHS ${OSL_PATH}/bin) + FIND_LIBRARY(OSL_LIBRARIES NAMES oslexec oslcomp oslquery PATHS ${CYCLES_OSL}/lib) + FIND_PATH(OSL_INCLUDES OSL/oslclosure.h ${CYCLES_OSL}/include) + FIND_PROGRAM(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin) IF(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER) SET(OSL_FOUND TRUE) @@ -116,12 +92,12 @@ ENDIF() ########################################################################### # Partio -IF(WITH_PARTIO) +IF(WITH_CYCLES_PARTIO) - MESSAGE(STATUS "PARTIO_PATH = ${PARTIO_PATH}") + MESSAGE(STATUS "CYCLES_PARTIO = ${CYCLES_PARTIO}") - FIND_LIBRARY(PARTIO_LIBRARIES NAMES partio PATHS ${PARTIO_PATH}/lib) - FIND_PATH(PARTIO_INCLUDES Partio.h ${PARTIO_PATH}/include) + FIND_LIBRARY(PARTIO_LIBRARIES NAMES partio PATHS ${CYCLES_PARTIO}/lib) + FIND_PATH(PARTIO_INCLUDES Partio.h ${CYCLES_PARTIO}/include) FIND_PACKAGE(ZLIB) @@ -140,35 +116,23 @@ IF(WITH_PARTIO) ENDIF() ########################################################################### -# Python - -IF(WITH_BLENDER) - - FIND_PATH(PYTHON_INCLUDE_DIRS Python.h PATHS ${PYTHON_PATH} ${PYTHON_PATH}/include ${PYTHON_PATH}/include/python3.1 ${PYTHON_PATH}/include/python3.2 NO_DEFAULT_PATH) - IF(WIN32) - FIND_LIBRARY(PYTHON_LIBRARIES NAMES python31 PATHS ${PYTHON_PATH}/lib) - ENDIF() - -ENDIF() - -########################################################################### # Blender -IF(WITH_BLENDER) - FIND_PATH(BLENDER_INCLUDE_DIRS RNA_blender.h PATHS ${BLENDER_PATH}/include) +IF(WITH_CYCLES_BLENDER) + FIND_PATH(BLENDER_INCLUDE_DIRS RNA_blender.h PATHS ${CMAKE_BINARY_DIR}/include) IF(WIN32) - SET(BLENDER_LIBRARIES ${BLENDER_PATH}/bin/Release/blender.lib) + SET(BLENDER_LIBRARIES ${CMAKE_BINARY_DIR}/bin/Release/blender.lib) ENDIF() ENDIF() ########################################################################### # CUDA -IF(WITH_CUDA) +IF(WITH_CYCLES_CUDA) - FIND_LIBRARY(CUDA_LIBRARIES NAMES cuda PATHS ${CUDA_PATH}/lib ${CUDA_PATH}/lib/Win32 NO_DEFAULT_PATH) - FIND_PATH(CUDA_INCLUDES cuda.h ${CUDA_PATH}/include NO_DEFAULT_PATH) - FIND_PROGRAM(CUDA_NVCC NAMES nvcc PATHS ${CUDA_PATH}/bin NO_DEFAULT_PATH) + FIND_LIBRARY(CUDA_LIBRARIES NAMES cuda PATHS ${CYCLES_CUDA}/lib ${CYCLES_CUDA}/lib/Win32 NO_DEFAULT_PATH) + FIND_PATH(CUDA_INCLUDES cuda.h ${CYCLES_CUDA}/include NO_DEFAULT_PATH) + FIND_PROGRAM(CUDA_NVCC NAMES nvcc PATHS ${CYCLES_CUDA}/bin NO_DEFAULT_PATH) IF(CUDA_INCLUDES AND CUDA_LIBRARIES AND CUDA_NVCC) MESSAGE(STATUS "CUDA includes = ${CUDA_INCLUDES}") @@ -186,7 +150,7 @@ ENDIF() ########################################################################### # OpenCL -IF(WITH_OPENCL) +IF(WITH_CYCLES_OPENCL) IF(APPLE) SET(OPENCL_INCLUDES "/System/Library/Frameworks/OpenCL.framework/Headers") @@ -199,7 +163,7 @@ IF(WITH_OPENCL) ENDIF() IF(UNIX AND NOT APPLE) - SET(OPENCL_INCLUDES ${OPENCL_PATH}) + SET(OPENCL_INCLUDES ${CYCLES_OPENCL}) SET(OPENCL_LIRBARIES "OpenCL") ENDIF() diff --git a/intern/cycles/cmake/platforms.cmake b/intern/cycles/cmake/platforms.cmake index ebc4b01edbc..075b4761a85 100644 --- a/intern/cycles/cmake/platforms.cmake +++ b/intern/cycles/cmake/platforms.cmake @@ -1,7 +1,7 @@ # Platform specific build flags -SET(GCC_WARNING_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-long-long") # -pedantic +SET(GCC_WARNING_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-long-long") SET(GCC_OPTIM_FLAGS "-ffast-math -fPIC -msse -msse2 -msse3 -mtune=native") IF(APPLE) |