Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-06-18 18:12:54 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-06-18 18:12:54 +0400
commit968b2a8afbef552988d10df38e358d97d273dc8c (patch)
tree5ded93eec5c0762cbbd77d09d21ff81b3d6bc524 /intern
parent549c2c58a109974408de29515b48161a756491c9 (diff)
rename cmake include/libraries to conform with suggested cmake names
Diffstat (limited to 'intern')
-rw-r--r--intern/audaspace/CMakeLists.txt12
-rw-r--r--intern/smoke/CMakeLists.txt2
2 files changed, 7 insertions, 7 deletions
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}")