From 968b2a8afbef552988d10df38e358d97d273dc8c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 18 Jun 2011 14:12:54 +0000 Subject: rename cmake include/libraries to conform with suggested cmake names --- CMakeLists.txt | 116 +++++++++++++------------- build_files/cmake/macros.cmake | 22 ++--- intern/audaspace/CMakeLists.txt | 12 +-- intern/smoke/CMakeLists.txt | 2 +- source/blender/blenkernel/CMakeLists.txt | 4 +- source/blender/blenlib/CMakeLists.txt | 2 +- source/blender/blenpluginapi/CMakeLists.txt | 2 +- source/blender/collada/CMakeLists.txt | 20 ++--- source/blender/editors/render/CMakeLists.txt | 2 +- source/blender/imbuf/CMakeLists.txt | 4 +- source/blender/makesrna/intern/CMakeLists.txt | 2 +- source/blender/quicktime/CMakeLists.txt | 2 +- source/blender/render/CMakeLists.txt | 2 +- source/blender/windowmanager/CMakeLists.txt | 4 +- source/creator/CMakeLists.txt | 2 +- source/gameengine/VideoTexture/CMakeLists.txt | 4 +- 16 files changed, 100 insertions(+), 102 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91fe2aa0f7f..089993ba917 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -277,8 +277,8 @@ if(UNIX AND NOT APPLE) 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 @@ if(UNIX AND NOT APPLE) endif() endif() - find_package(Freetype) + find_package(Freetype REQUIRED) # unset(FREETYPE_INCLUDE_DIRS CACHE) # cant use @@ -364,33 +364,33 @@ if(UNIX AND NOT APPLE) 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(UNIX AND NOT APPLE) 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(UNIX AND NOT APPLE) 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 @@ elseif(WIN32) 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 @@ elseif(WIN32) 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 @@ elseif(WIN32) 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 @@ elseif(WIN32) 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 @@ elseif(WIN32) 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 @@ elseif(WIN32) 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 @@ elseif(WIN32) 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 @@ elseif(WIN32) 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 @@ elseif(WIN32) 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 @@ elseif(APPLE) 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 @@ elseif(APPLE) 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 @@ elseif(APPLE) 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 @@ elseif(APPLE) 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" ) + set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" ) #pcre is bundled with openCollada #set(PCRE ${LIBDIR}/pcre) #set(PCRE_LIBPATH ${PCRE}/lib) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index b0b777f936a..3776bbb7ecc 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -127,7 +127,7 @@ macro(SETUP_LIBDIRS) link_directories(${SNDFILE_LIBPATH}) endif() if(WITH_SAMPLERATE) - link_directories(${LIBSAMPLERATE_LIBPATH}) + link_directories(${SAMPLERATE_LIBPATH}) endif() if(WITH_FFTW3) link_directories(${FFTW3_LIBPATH}) @@ -186,7 +186,7 @@ macro(setup_liblinks target_link_libraries(${target} ${GETTEXT_LIB}) if(WIN32 AND NOT UNIX) - target_link_libraries(${target} ${ICONV_LIB}) + target_link_libraries(${target} ${ICONV_LIBRARIES}) endif() endif() @@ -194,22 +194,22 @@ macro(setup_liblinks target_link_libraries(${target} ${OPENAL_LIBRARY}) endif() if(WITH_FFTW3) - target_link_libraries(${target} ${FFTW3_LIB}) + target_link_libraries(${target} ${FFTW3_LIBRARIES}) endif() if(WITH_JACK) - target_link_libraries(${target} ${JACK_LIB}) + target_link_libraries(${target} ${JACK_LIBRARIES}) endif() if(WITH_CODEC_SNDFILE) target_link_libraries(${target} ${SNDFILE_LIBRARIES}) endif() if(WITH_SAMPLERATE) - target_link_libraries(${target} ${LIBSAMPLERATE_LIB}) + target_link_libraries(${target} ${SAMPLERATE_LIBRARIES}) endif() if(WITH_SDL) target_link_libraries(${target} ${SDL_LIBRARY}) endif() if(WITH_CODEC_QUICKTIME) - target_link_libraries(${target} ${QUICKTIME_LIB}) + target_link_libraries(${target} ${QUICKTIME_LIBRARIES}) endif() if(WITH_IMAGE_TIFF) target_link_libraries(${target} ${TIFF_LIBRARY}) @@ -232,11 +232,11 @@ macro(setup_liblinks target_link_libraries(${target} ${OPENJPEG_LIB}) endif() if(WITH_CODEC_FFMPEG) - target_link_libraries(${target} ${FFMPEG_LIB}) + target_link_libraries(${target} ${FFMPEG_LIBRARIES}) endif() if(WITH_OPENCOLLADA) if(WIN32 AND NOT UNIX) - foreach(_LOOP_VAR ${OPENCOLLADA_LIB}) + foreach(_LOOP_VAR ${OPENCOLLADA_LIBRARIES}) target_link_libraries(${target} debug ${_LOOP_VAR}_d optimized ${_LOOP_VAR}) @@ -252,16 +252,16 @@ macro(setup_liblinks endif() else() target_link_libraries(${target} - ${OPENCOLLADA_LIB} + ${OPENCOLLADA_LIBRARIES} ${PCRE_LIB} ${EXPAT_LIB}) endif() endif() if(WITH_MEM_JEMALLOC) - target_link_libraries(${target} ${JEMALLOC_LIBRARY}) + target_link_libraries(${target} ${JEMALLOC_LIBRARIES}) endif() if(WIN32 AND NOT UNIX) - target_link_libraries(${target} ${PTHREADS_LIB}) + target_link_libraries(${target} ${PTHREADS_LIBRARIES}) endif() endmacro() diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index e2356256af5..ab88c9ecabd 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -1,7 +1,7 @@ # $Id$ # ***** BEGIN LGPL LICENSE BLOCK ***** # -# Copyright 2009 Jörg Hermann Müller +# Copyright 2009 Jrg Hermann Mller # # This file is part of AudaSpace. # @@ -29,7 +29,7 @@ set(INC ) set(INC_SYS - ${PTHREADS_INC} + ${PTHREADS_INCLUDE_DIRS} ) set(SRC @@ -160,7 +160,7 @@ set(SRC if(WITH_CODEC_FFMPEG) add_definitions(-DWITH_FFMPEG) list(APPEND INC ffmpeg) - list(APPEND INC_SYS ${FFMPEG_INC}) + list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS}) list(APPEND SRC ffmpeg/AUD_FFMPEGFactory.cpp ffmpeg/AUD_FFMPEGReader.cpp @@ -195,7 +195,7 @@ endif() if(WITH_JACK) add_definitions(-DWITH_JACK) list(APPEND INC jack) - list(APPEND INC_SYS ${JACK_INC}) + list(APPEND INC_SYS ${JACK_INCLUDE_DIRS}) list(APPEND SRC jack/AUD_JackDevice.cpp @@ -218,7 +218,7 @@ endif() if(WITH_SAMPLERATE) add_definitions(-DWITH_SAMPLERATE) - list(APPEND INC_SYS ${LIBSAMPLERATE_INC}) + list(APPEND INC_SYS ${SAMPLERATE_INCLUDE_DIRS}) list(APPEND SRC SRC/AUD_SRCResampleFactory.cpp SRC/AUD_SRCResampleReader.cpp @@ -231,7 +231,7 @@ endif() if(WITH_FFTW3 AND FALSE) add_definitions(-DWITH_FFTW3) list(APPEND INC fftw) - list(APPEND INC_SYS ${FFTW3_INC}) + list(APPEND INC_SYS ${FFTW3_INCLUDE_DIRS}) list(APPEND SRC fftw/AUD_BandPassFactory.cpp fftw/AUD_BandPassReader.cpp diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index c787f54b284..30313f45a92 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -89,7 +89,7 @@ endif() if(WITH_FFTW3) add_definitions(-DFFTW3=1) - list(APPEND INC ${FFTW3_INC}) + list(APPEND INC ${FFTW3_INCLUDE_DIRS}) endif() blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 5078657588d..9c06e325ce2 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -273,12 +273,12 @@ endif() if(WITH_CODEC_QUICKTIME) list(APPEND INC ../quicktime) - list(APPEND INC_SYS ${QUICKTIME_INC}) + list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) add_definitions(-DWITH_QUICKTIME) endif() if(WITH_CODEC_FFMPEG) - list(APPEND INC_SYS ${FFMPEG_INC}) + list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS}) add_definitions(-DWITH_FFMPEG) endif() diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 0c25da325ad..c6848346220 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -137,7 +137,7 @@ set(SRC ) if(WITH_BINRELOC) - list(APPEND INC_SYS "${BINRELOC_INC}") + list(APPEND INC_SYS "${BINRELOC_INCLUDE_DIRS}") add_definitions(-DWITH_BINRELOC) endif() diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt index c3aad25ccbe..a5af15d7f55 100644 --- a/source/blender/blenpluginapi/CMakeLists.txt +++ b/source/blender/blenpluginapi/CMakeLists.txt @@ -50,7 +50,7 @@ set(SRC ) if(WITH_CODEC_QUICKTIME) - list(APPEND INC_SYS ${QUICKTIME_INC}) + list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) add_definitions(-DWITH_QUICKTIME) endif() diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index a7e7c973f36..07da532146f 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -44,19 +44,19 @@ set(INC_SYS if(APPLE) list(APPEND INC_SYS - ${OPENCOLLADA_INC}/COLLADAStreamWriter - ${OPENCOLLADA_INC}/COLLADABaseUtils - ${OPENCOLLADA_INC}/COLLADAFramework - ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader - ${OPENCOLLADA_INC}/GeneratedSaxParser + ${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter + ${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils + ${OPENCOLLADA_INCLUDE_DIR}/COLLADAFramework + ${OPENCOLLADA_INCLUDE_DIR}/COLLADASaxFrameworkLoader + ${OPENCOLLADA_INCLUDE_DIR}/GeneratedSaxParser ) else() list(APPEND INC_SYS - ${OPENCOLLADA_INC}/COLLADAStreamWriter/include - ${OPENCOLLADA_INC}/COLLADABaseUtils/include - ${OPENCOLLADA_INC}/COLLADAFramework/include - ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader/include - ${OPENCOLLADA_INC}/GeneratedSaxParser/include + ${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter/include + ${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils/include + ${OPENCOLLADA_INCLUDE_DIR}/COLLADAFramework/include + ${OPENCOLLADA_INCLUDE_DIR}/COLLADASaxFrameworkLoader/include + ${OPENCOLLADA_INCLUDE_DIR}/GeneratedSaxParser/include ) endif() diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index c3bb6f457a2..0d1de00806b 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -52,7 +52,7 @@ set(SRC if(WITH_CODEC_QUICKTIME) list(APPEND INC ../../quicktime) - list(APPEND INC_SYS ${QUICKTIME_INC}) + list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) add_definitions(-DWITH_QUICKTIME) endif() diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 16bc7854617..812d5c03fdb 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -130,12 +130,12 @@ endif() if(WITH_CODEC_QUICKTIME) list(APPEND INC ../quicktime) - list(APPEND INC_SYS ${QUICKTIME_INC}) + list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) add_definitions(-DWITH_QUICKTIME) endif() if(WITH_CODEC_FFMPEG) - list(APPEND INC_SYS ${FFMPEG_INC}) + list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS}) add_definitions(-DWITH_FFMPEG) endif() diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 4e4ff396e71..ed5a1566cdc 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -177,7 +177,7 @@ if(WITH_CODEC_QUICKTIME) endif() if(WITH_CODEC_FFMPEG) - list(APPEND INC_SYS ${FFMPEG_INC}) + list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS}) add_definitions(-DWITH_FFMPEG) endif() diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt index 3b70cf19a7f..0ed773ddd93 100644 --- a/source/blender/quicktime/CMakeLists.txt +++ b/source/blender/quicktime/CMakeLists.txt @@ -43,7 +43,7 @@ set(INC ) set(INC_SYS - ${QUICKTIME_INC} + ${QUICKTIME_INCLUDE_DIRS} ) if(USE_QTKIT) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index aea377a35bb..7521d6b9ce5 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -124,7 +124,7 @@ endif() if(WITH_CODEC_QUICKTIME) list(APPEND INC ../quicktime) - list(APPEND INC_SYS ${QUICKTIME_INC}) + list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) add_definitions(-DWITH_QUICKTIME) endif() diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 0cf59a9b598..f9c1d800c02 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -90,12 +90,12 @@ endif() if(WITH_CODEC_QUICKTIME) list(APPEND INC ../quicktime) - list(APPEND INC_SYS ${QUICKTIME_INC}) + list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) add_definitions(-DWITH_QUICKTIME) endif() if(WITH_CODEC_FFMPEG) - list(APPEND INC_SYS ${FFMPEG_INC}) + list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS}) add_definitions(-DWITH_FFMPEG) endif() diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 85fda11bd66..afea07b5076 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -97,7 +97,7 @@ endif() if(WITH_BINRELOC) add_definitions(-DWITH_BINRELOC) - blender_include_dirs(${BINRELOC_INC}) + blender_include_dirs(${BINRELOC_INCLUDE_DIRS}) endif() # Setup the exe sources and buildinfo diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt index 201714be74a..c412363dc3b 100644 --- a/source/gameengine/VideoTexture/CMakeLists.txt +++ b/source/gameengine/VideoTexture/CMakeLists.txt @@ -91,8 +91,8 @@ set(SRC if(WITH_CODEC_FFMPEG) list(APPEND INC_SYS - ${FFMPEG_INC} - ${PTHREADS_INC} + ${FFMPEG_INCLUDE_DIRS} + ${PTHREADS_INCLUDE_DIRS} ) add_definitions(-DWITH_FFMPEG) add_definitions(-D__STDC_CONSTANT_MACROS) -- cgit v1.2.3