Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for building with MSVC release, some edits I made didnt work as I expected but still built for debug

Browse Source
This commit is contained in:
Campbell Barton
2011-06-25 14:10:46 +00:00
parent 75f572ebb8
commit 418bce9341
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
build_files/cmake/macros.cmake
View File

@@ -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()