diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-18 18:12:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-18 18:12:54 +0400 |
| commit | 968b2a8afbef552988d10df38e358d97d273dc8c (patch) | |
| tree | 5ded93eec5c0762cbbd77d09d21ff81b3d6bc524 /build_files | |
| parent | 549c2c58a109974408de29515b48161a756491c9 (diff) | |
rename cmake include/libraries to conform with suggested cmake names
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 22 |
1 files changed, 11 insertions, 11 deletions
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() |