diff options
Diffstat (limited to 'build_files/cmake/macros.cmake')
| -rw-r--r-- | build_files/cmake/macros.cmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 58938c8b0b0..aec7a9fd96c 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -295,10 +295,10 @@ macro(setup_liblinks target_link_libraries_optimized(${target} "${OPENCOLLADA_LIBRARIES}") unset(OPENCOLLADA_LIBRARIES_DEBUG) - file_list_suffix(PCRE_LIB_DEBUG "${PCRE_LIB}" "_d") - target_link_libraries_debug(${target} "${PCRE_LIB_DEBUG}") - target_link_libraries_optimized(${target} "${PCRE_LIB}") - unset(PCRE_LIB_DEBUG) + file_list_suffix(PCRE_LIBRARIES_DEBUG "${PCRE_LIBRARIES}" "_d") + target_link_libraries_debug(${target} "${PCRE_LIBRARIES_DEBUG}") + target_link_libraries_optimized(${target} "${PCRE_LIBRARIES}") + unset(PCRE_LIBRARIES_DEBUG) if(EXPAT_LIB) file_list_suffix(EXPAT_LIB_DEBUG "${EXPAT_LIB}" "_d") @@ -309,7 +309,8 @@ macro(setup_liblinks else() target_link_libraries(${target} ${OPENCOLLADA_LIBRARIES} - ${PCRE_LIB} + ${PCRE_LIBRARIES} + ${XML2_LIBRARIES} ${EXPAT_LIB}) endif() endif() @@ -392,6 +393,7 @@ macro(remove_strict_flags) remove_flag("-Wstrict-prototypes") remove_flag("-Wunused-parameter") remove_flag("-Wwrite-strings") + remove_flag("-Wundef") remove_flag("-Wshadow") remove_flag("-Werror=[^ ]+") remove_flag("-Werror") |