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 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 57 insertions(+), 59 deletions(-) (limited to 'CMakeLists.txt') 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) -- cgit v1.2.3