diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-25 18:10:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-25 18:10:46 +0400 |
| commit | 418bce934129bacdee30a3cbffa47e7d299bd3ff (patch) | |
| tree | d80288ec84100b2757cc6c55ef8bf31340725d4c /build_files | |
| parent | 75f572ebb8fa251e7ef1f131cf1e54880b36bcf2 (diff) | |
fix for building with MSVC release, some edits I made didnt work as I expected but still built for debug
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index bb3761d4539..1800c4eb826 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -202,9 +202,8 @@ macro(setup_liblinks if(WIN32 AND NOT UNIX) file_list_suffix(PYTHON_LIBRARIES_DEBUG "${PYTHON_LIBRARIES}" "_d") - target_link_libraries(${target} - debug ${PYTHON_LIBRARIES_DEBUG} - optimized ${PYTHON_LIBRARIES}) + target_link_libraries(${target} debug ${PYTHON_LIBRARIES_DEBUG}) + target_link_libraries(${target} optimized ${PYTHON_LIBRARIES}) unset(PYTHON_LIBRARIES_DEBUG) else() target_link_libraries(${target} ${PYTHON_LIBRARIES}) @@ -257,9 +256,8 @@ macro(setup_liblinks if(WITH_IMAGE_OPENEXR) if(WIN32 AND NOT UNIX) file_list_suffix(OPENEXR_LIBRARIES_DEBUG "${OPENEXR_LIBRARIES}" "_d") - target_link_libraries(${target} - debug ${OPENEXR_LIBRARIES_DEBUG} - optimized ${OPENEXR_LIBRARIES}) + target_link_libraries(${target} debug ${OPENEXR_LIBRARIES_DEBUG}) + target_link_libraries(${target} optimized ${OPENEXR_LIBRARIES}) unset(OPENEXR_LIBRARIES_DEBUG) else() target_link_libraries(${target} ${OPENEXR_LIBRARIES}) @@ -274,22 +272,19 @@ macro(setup_liblinks if(WITH_OPENCOLLADA) if(WIN32 AND NOT UNIX) file_list_suffix(OPENCOLLADA_LIBRARIES_DEBUG "${OPENCOLLADA_LIBRARIES}" "_d") - target_link_libraries(${target} - debug ${OPENCOLLADA_LIBRARIES_DEBUG} - optimized ${OPENCOLLADA_LIBRARIES}) + target_link_libraries(${target} debug ${OPENCOLLADA_LIBRARIES_DEBUG}) + target_link_libraries(${target} optimized ${OPENCOLLADA_LIBRARIES}) unset(OPENCOLLADA_LIBRARIES_DEBUG) file_list_suffix(PCRE_LIB_DEBUG "${PCRE_LIB}" "_d") - target_link_libraries(${target} - debug ${PCRE_LIB_DEBUG} - optimized ${PCRE_LIB}) + target_link_libraries(${target} debug ${PCRE_LIB_DEBUG}) + target_link_libraries(${target} optimized ${PCRE_LIB}) unset(PCRE_LIB_DEBUG) if(EXPAT_LIB) file_list_suffix(EXPAT_LIB_DEBUG "${EXPAT_LIB}" "_d") - target_link_libraries(${target} - debug ${EXPAT_LIB_DEBUG} - optimized ${EXPAT_LIB}) + target_link_libraries(${target} debug ${EXPAT_LIB_DEBUG}) + target_link_libraries(${target} optimized ${EXPAT_LIB}) unset(EXPAT_LIB_DEBUG) endif() else() |