diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-07 05:13:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-07 05:13:10 +0400 |
| commit | 2406ebe1a47c388df8b1ea003d7f768df947460f (patch) | |
| tree | a1bdf0b221d4861e53aaf3e70578d1fd738f9bda /intern/audaspace/CMakeLists.txt | |
| parent | e0aca888deeeeeba86959ed974619140667db1fb (diff) | |
- added back zlib include (needed for win32).
- use list append in more places.
- remove non existing include dir.
Diffstat (limited to 'intern/audaspace/CMakeLists.txt')
| -rw-r--r-- | intern/audaspace/CMakeLists.txt | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 5d73f953e67..6982bd83276 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -36,49 +36,43 @@ FILE(GLOB SRC ) IF(WITH_FFMPEG) - LIST(APPEND INC ffmpeg) - LIST(APPEND INC ${FFMPEG_INC}) + LIST(APPEND INC ffmpeg ${FFMPEG_INC}) FILE(GLOB FFMPEGSRC ffmpeg/*.cpp) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) IF(WITH_SDL) - LIST(APPEND INC SDL) - LIST(APPEND INC ${SDL_INCLUDE_DIR}) + LIST(APPEND INC SDL ${SDL_INCLUDE_DIR}) FILE(GLOB SDLSRC SDL/*.cpp) ADD_DEFINITIONS(-DWITH_SDL) ENDIF(WITH_SDL) IF(WITH_OPENAL) - LIST(APPEND INC OpenAL) - LIST(APPEND INC ${OPENAL_INCLUDE_DIR}) + LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR}) FILE(GLOB OPENALSRC OpenAL/*.cpp) ADD_DEFINITIONS(-DWITH_OPENAL) ENDIF(WITH_OPENAL) IF(WITH_JACK) - LIST(APPEND INC jack) - LIST(APPEND INC ${JACK_INC}) + LIST(APPEND INC jack ${JACK_INC}) FILE(GLOB JACKSRC jack/*.cpp) ADD_DEFINITIONS(-DWITH_JACK) ENDIF(WITH_JACK) IF(WITH_SNDFILE) - LIST(APPEND INC sndfile) - LIST(APPEND INC ${SNDFILE_INC}) + LIST(APPEND INC sndfile ${SNDFILE_INC}) FILE(GLOB SNDFILESRC sndfile/*.cpp) ADD_DEFINITIONS(-DWITH_SNDFILE) ENDIF(WITH_SNDFILE) #IF(WITH_FFTW3) -# SET(INC ${INC} fftw ${FFTW3_INC}) +# LIST(APPEND INC fftw ${FFTW3_INC}) # FILE(GLOB FFTW3SRC fftw/*.cpp) # ADD_DEFINITIONS(-DWITH_FFTW3) #ENDIF(WITH_FFTW3) IF(WITH_PYTHON) - LIST(APPEND INC Python) - LIST(APPEND INC ${PYTHON_INC}) + LIST(APPEND INC Python ${PYTHON_INC}) FILE(GLOB PYTHONSRC Python/*.cpp) ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) |