Revision: 37618
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37618
Author: campbellbarton
Date: 2011-06-18 14:12:54 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
rename cmake include/libraries to conform with suggested cmake names
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/intern/smoke/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
trunk/blender/source/blender/collada/CMakeLists.txt
trunk/blender/source/blender/editors/render/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/quicktime/CMakeLists.txt
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-06-18 12:12:19 UTC (rev 37617)
+++ trunk/blender/CMakeLists.txt 2011-06-18 14:12:54 UTC (rev 37618)
@@ -277,8 +277,8 @@
if(WITH_JACK)
set(JACK /usr)
- set(JACK_INC ${JACK}/include/jack)
- set(JACK_LIB jack)
+ set(JACK_INCLUDE_DIRS ${JACK}/include/jack)
+ set(JACK_LIBRARIES jack)
set(JACK_LIBPATH ${JACK}/lib)
endif()
@@ -309,7 +309,7 @@
endif()
endif()
- find_package(Freetype)
+ find_package(Freetype REQUIRED)
# unset(FREETYPE_INCLUDE_DIRS CACHE) # cant use
@@ -364,33 +364,33 @@
if(WITH_CODEC_FFMPEG)
set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
mark_as_advanced(FFMPEG)
- set(FFMPEG_INC ${FFMPEG}/include)
- set(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE
STRING "FFMPEG Libraries")
- mark_as_advanced(FFMPEG_LIB)
+ set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+ set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale
CACHE STRING "FFMPEG Libraries")
+ mark_as_advanced(FFMPEG_LIBRARIES)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
-D__STDC_CONSTANT_MACROS")
endif()
if(WITH_FFTW3)
set(FFTW3 /usr)
- set(FFTW3_INC ${FFTW3}/include)
- set(FFTW3_LIB fftw3)
+ set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
+ set(FFTW3_LIBRARIES fftw3)
set(FFTW3_LIBPATH ${FFTW3}/lib)
endif()
if(WITH_SAMPLERATE)
- set(LIBSAMPLERATE /usr)
- set(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
- set(LIBSAMPLERATE_LIB samplerate)
- set(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ set(SAMPLERATE /usr)
+ set(SAMPLERATE_INCLUDE_DIRS ${SAMPLERATE}/include)
+ set(SAMPLERATE_LIBRARIES samplerate)
+ set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
endif()
if(WITH_OPENCOLLADA)
set(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH
"OpenCollada Directory")
mark_as_advanced(OPENCOLLADA)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIB OpenCOLLADAStreamWriter
OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils
GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
- set(OPENCOLLADA_INC ${OPENCOLLADA})
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter
OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils
GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
+ set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
set(PCRE /usr CACHE FILEPATH "PCRE Directory")
mark_as_advanced(PCRE)
@@ -405,7 +405,7 @@
if(WITH_MEM_JEMALLOC)
set(JEMALLOC /usr)
- set(JEMALLOC_LIBRARY jemalloc CACHE STRING "JeMalloc library")
+ set(JEMALLOC_LIBRARIES jemalloc CACHE STRING "JeMalloc library")
set(JEMALLOC_LIBPATH ${JEMALLOC}/lib CACHE FILEPATH "JeMalloc
library path")
# no use for this yet.
# set(JEMALLOC_INCLUDE_DIR ${JEMALLOC}/include CACHE FILEPATH
"JeMalloc include path")
@@ -431,10 +431,8 @@
if(NOT WITH_PYTHON_MODULE)
# BSD's dont use libdl.so
list(APPEND LLIBS -ldl)
-
# binreloc is linux only
- set(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
- set(BINRELOC_INC ${BINRELOC}/include)
+ set(BINRELOC_INCLUDE_DIRS
${CMAKE_SOURCE_DIR}/extern/binreloc/include)
set(WITH_BINRELOC ON)
endif()
endif()
@@ -487,16 +485,16 @@
if(WITH_INTERNATIONAL)
set(ICONV ${LIBDIR}/iconv)
- set(ICONV_INC ${ICONV}/include)
- set(ICONV_LIB iconv)
+ set(ICONV_INCLUDE_DIRS ${ICONV}/include)
+ set(ICONV_LIBRARIES iconv)
set(ICONV_LIBPATH ${ICONV}/lib)
endif()
if(WITH_SAMPLERATE)
- set(LIBSAMPLERATE ${LIBDIR}/samplerate)
- set(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
- set(LIBSAMPLERATE_LIB libsamplerate)
- set(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ set(SAMPLERATE ${LIBDIR}/samplerate)
+ set(SAMPLERATE_INCLUDE_DIRS ${SAMPLERATE}/include)
+ set(SAMPLERATE_LIBRARIES libsamplerate)
+ set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
endif()
set(PNG "${LIBDIR}/png")
@@ -532,8 +530,8 @@
if(WITH_CODEC_QUICKTIME)
set(QUICKTIME ${LIBDIR}/QTDevWin)
- set(QUICKTIME_INC ${QUICKTIME}/CIncludes)
- set(QUICKTIME_LIB qtmlClient)
+ set(QUICKTIME_INCLUDE_DIRS ${QUICKTIME}/CIncludes)
+ set(QUICKTIME_LIBRARIES qtmlClient)
set(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
endif()
@@ -596,9 +594,9 @@
endif()
set(PTHREADS ${LIBDIR}/pthreads)
- set(PTHREADS_INC ${PTHREADS}/include)
+ set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
set(PTHREADS_LIBPATH ${PTHREADS}/lib)
- set(PTHREADS_LIB pthreadVC2)
+ set(PTHREADS_LIBRARIES pthreadVC2)
set(FREETYPE ${LIBDIR}/freetype)
set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include
${FREETYPE}/include/freetype2)
@@ -607,23 +605,23 @@
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/fftw3)
- set(FFTW3_LIB libfftw)
- set(FFTW3_INC ${FFTW3}/include)
+ set(FFTW3_LIBRARIES libfftw)
+ set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
set(FFTW3_LIBPATH ${FFTW3}/lib)
endif()
if(WITH_OPENCOLLADA)
set(OPENCOLLADA ${LIBDIR}/opencollada)
- set(OPENCOLLADA_INC ${OPENCOLLADA}/include)
+ set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver
GeneratedSaxParser xml2 buffer ftoa UTF)
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver
GeneratedSaxParser xml2 buffer ftoa UTF)
set(PCRE_LIB pcre)
endif()
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
- set(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
- set(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52
avutil-50 swscale-0)
+ set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include
${FFMPEG}/include/msvc)
+ set(FFMPEG_LIBRARIES avcodec-52 avformat-52 avdevice-52
avutil-50 swscale-0)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
endif()
@@ -667,8 +665,8 @@
if(WITH_JACK)
set(JACK ${LIBDIR}/jack)
- set(JACK_INC ${JACK}/include/jack ${JACK}/include)
- set(JACK_LIB libjack)
+ set(JACK_INCLUDE_DIRS ${JACK}/include/jack
${JACK}/include)
+ set(JACK_LIBRARIES libjack)
set(JACK_LIBPATH ${JACK}/lib)
endif()
@@ -721,9 +719,9 @@
set(ZLIB_LIBRARIES z)
set(PTHREADS ${LIBDIR}/pthreads)
- set(PTHREADS_INC ${PTHREADS}/include)
+ set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
set(PTHREADS_LIBPATH ${PTHREADS}/lib)
- set(PTHREADS_LIB pthreadGC2)
+ set(PTHREADS_LIBRARIES pthreadGC2)
set(FREETYPE ${LIBDIR}/gcc/freetype)
set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include
${FREETYPE}/include/freetype2)
@@ -732,23 +730,23 @@
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/gcc/fftw3)
- set(FFTW3_LIB fftw3)
- set(FFTW3_INC ${FFTW3}/include)
+ set(FFTW3_LIBRARIES fftw3)
+ set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
set(FFTW3_LIBPATH ${FFTW3}/lib)
endif()
if(WITH_OPENCOLLADA)
set(OPENCOLLADA ${LIBDIR}/gcc/opencollada)
- set(OPENCOLLADA_INC ${OPENCOLLADA}/include)
+ set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib
${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIB OpenCOLLADAStreamWriter
OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils
GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter
OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils
GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
set(PCRE_LIB pcre)
endif()
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
- set(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include)
- set(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52
avutil-50 swscale-0)
+ set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include
${FFMPEG}/include)
+ set(FFMPEG_LIBRARIES avcodec-52 avformat-52 avdevice-52
avutil-50 swscale-0)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
endif()
@@ -771,8 +769,8 @@
if(WITH_JACK)
set(JACK ${LIBDIR}/jack)
- set(JACK_INC ${JACK}/include/jack ${JACK}/include)
- set(JACK_LIB jack)
+ set(JACK_INCLUDE_DIRS ${JACK}/include/jack
${JACK}/include)
+ set(JACK_LIBRARIES jack)
set(JACK_LIBPATH ${JACK}/lib)
# TODO, gives linking errors, force off
@@ -793,7 +791,7 @@
endif()
# used in many places so include globally, like OpenGL
- blender_include_dirs("${PTHREADS_INC}")
+ blender_include_dirs("${PTHREADS_INCLUDE_DIRS}")
elseif(APPLE)
@@ -824,8 +822,8 @@
if(WITH_JACK)
set(JACK /usr)
- set(JACK_INC ${JACK}/include/jack)
- set(JACK_LIB jack)
+ set(JACK_INCLUDE_DIRS ${JACK}/include/jack)
+ set(JACK_LIBRARIES jack)
set(JACK_LIBPATH ${JACK}/lib)
endif()
@@ -868,8 +866,8 @@
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/fftw3)
- set(FFTW3_INC ${FFTW3}/include)
- set(FFTW3_LIB fftw3)
+ set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
+ set(FFTW3_LIBRARIES fftw3)
set(FFTW3_LIBPATH ${FFTW3}/lib)
endif()
@@ -894,17 +892,17 @@
if(WITH_CODEC_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_INCLUDE_DIRS ${FFMPEG}/include)
+ set(FFMPEG_LIBRARIES avcodec avdevice avformat avutil mp3lame
swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile
ogg)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
-D__STDC_CONSTANT_MACROS")
endif()
if(WITH_SAMPLERATE)
- set(LIBSAMPLERATE ${LIBDIR}/samplerate)
- set(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
- set(LIBSAMPLERATE_LIB samplerate)
- set(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ set(SAMPLERATE ${LIBDIR}/samplerate)
+ set(SAMPLERATE_INCLUDE_DIRS ${SAMPLERATE}/include)
+ set(SAMPLERATE_LIBRARIES samplerate)
+ set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
endif()
set(LLIBS stdc++ SystemStubs)
@@ -929,9 +927,9 @@
if(WITH_OPENCOLLADA)
set(OPENCOLLADA ${LIBDIR}/opencollada)
- set(OPENCOLLADA_INC ${OPENCOLLADA}/include)
+ set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIB "OpenCOLLADASaxFrameworkLoader
-lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter
-lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" )
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
