projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2a7f975
5804667
)
Merge pull request #1432 from turol/asan
author
Kim Kulling
<kimkulling@users.noreply.github.com>
Wed, 4 Oct 2017 14:12:44 +0000
(16:12 +0200)
committer
GitHub
<noreply@github.com>
Wed, 4 Oct 2017 14:12:44 +0000
(16:12 +0200)
Asan
1
2
CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CMakeLists.txt
index
7718002
,
a4248eb
..
5c0fe06
---
1
/
CMakeLists.txt
---
2
/
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)