diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-06 14:15:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-06 14:15:41 +0400 |
| commit | 04b0dcd9e53206d3208c0a846d2e52f262bad985 (patch) | |
| tree | 1b21679c6c12019bb3663e0277fe54ce979a2726 /intern | |
| parent | eef3b72c0e64c01ef8a8d1a84c42377a1b2973e0 (diff) | |
- use list append in more places (preferred method since its faster)
- remove some unused include paths
- remove unused linux path define
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/audaspace/CMakeLists.txt | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index b1ded10e539..5d73f953e67 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -20,36 +20,52 @@ # # ***** END LGPL LICENSE BLOCK ***** -SET(INC . intern FX SRC ${PTHREADS_INC} ${LIBSAMPLERATE_INC}) +SET(INC + . + intern + FX SRC + ${PTHREADS_INC} + ${LIBSAMPLERATE_INC} +) -FILE(GLOB SRC intern/*.cpp intern/*.h FX/*.cpp SRC/*.cpp) +FILE(GLOB SRC + intern/*.cpp + intern/*.h + FX/*.cpp + SRC/*.cpp +) IF(WITH_FFMPEG) - SET(INC ${INC} ffmpeg ${FFMPEG_INC}) + LIST(APPEND INC ffmpeg) + LIST(APPEND INC ${FFMPEG_INC}) FILE(GLOB FFMPEGSRC ffmpeg/*.cpp) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) IF(WITH_SDL) - SET(INC ${INC} SDL ${SDL_INCLUDE_DIR}) + LIST(APPEND INC SDL) + LIST(APPEND INC ${SDL_INCLUDE_DIR}) FILE(GLOB SDLSRC SDL/*.cpp) ADD_DEFINITIONS(-DWITH_SDL) ENDIF(WITH_SDL) IF(WITH_OPENAL) - SET(INC ${INC} OpenAL ${OPENAL_INCLUDE_DIR}) + LIST(APPEND INC OpenAL) + LIST(APPEND INC ${OPENAL_INCLUDE_DIR}) FILE(GLOB OPENALSRC OpenAL/*.cpp) ADD_DEFINITIONS(-DWITH_OPENAL) ENDIF(WITH_OPENAL) IF(WITH_JACK) - SET(INC ${INC} jack ${JACK_INC}) + LIST(APPEND INC jack) + LIST(APPEND INC ${JACK_INC}) FILE(GLOB JACKSRC jack/*.cpp) ADD_DEFINITIONS(-DWITH_JACK) ENDIF(WITH_JACK) IF(WITH_SNDFILE) - SET(INC ${INC} sndfile ${SNDFILE_INC}) + LIST(APPEND INC sndfile) + LIST(APPEND INC ${SNDFILE_INC}) FILE(GLOB SNDFILESRC sndfile/*.cpp) ADD_DEFINITIONS(-DWITH_SNDFILE) ENDIF(WITH_SNDFILE) @@ -61,7 +77,8 @@ ENDIF(WITH_SNDFILE) #ENDIF(WITH_FFTW3) IF(WITH_PYTHON) - SET(INC ${INC} Python ${PYTHON_INC}) + LIST(APPEND INC Python) + LIST(APPEND INC ${PYTHON_INC}) FILE(GLOB PYTHONSRC Python/*.cpp) ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) |