From: Kim Kulling Date: Wed, 4 Oct 2017 14:12:44 +0000 (+0200) Subject: Merge pull request #1432 from turol/asan X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbca8f574ef867bddecff2865609f33d2b711fc9;p=platform%2Fupstream%2Fassimp.git Merge pull request #1432 from turol/asan Asan --- cbca8f574ef867bddecff2865609f33d2b711fc9 diff --cc CMakeLists.txt index 7718002,a4248eb..5c0fe06 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -224,14 -223,15 +228,19 @@@ if (ASSIMP_COVERALLS endif() if (ASSIMP_WERROR) + IF (MSVC) + add_compile_options(/WX) + ELSE() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") + ENDIF() endif() + if (ASSIMP_ASAN) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address") + endif() + INCLUDE (FindPkgMacros) INCLUDE (PrecompiledHeader)