diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-23 13:18:30 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-23 13:18:30 (GMT) |
| commit | 9cafaedb50c8e430cc8c34ef44a84bc1dbcb64ad (patch) | |
| tree | ffee9d6d930022c55710bc0931d0da6a77be27f0 /CMakeLists.txt | |
| parent | c9284a1aae6e876e0399c4757837bec3563751e2 (diff) | |
| parent | ecc4f838db18336c4afbc6dabb1a8edbc6d8bbd0 (diff) | |
| download | Doxygen-9cafaedb50c8e430cc8c34ef44a84bc1dbcb64ad.zip Doxygen-9cafaedb50c8e430cc8c34ef44a84bc1dbcb64ad.tar.gz Doxygen-9cafaedb50c8e430cc8c34ef44a84bc1dbcb64ad.tar.bz2 | |
Merge branch 'master' into spelling
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f93519..cd0fcaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,6 +70,9 @@ if (WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # needed for language.cpp on 64bit add_definitions(-DLIBICONV_STATIC -D_CRT_SECURE_NO_WARNINGS) endif() + if (CMAKE_GENERATOR MATCHES "NMake Makefiles") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") + endif() endif() if(POLICY CMP0063) @@ -82,9 +85,11 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) if (CMAKE_GENERATOR MATCHES "Ninja") set(LEX_FLAGS ) set(YACC_FLAGS ) + set(JAVACC_FLAGS ) else () set(LEX_FLAGS $(LEX_FLAGS)) set(YACC_FLAGS $(YACC_FLAGS)) + set(JAVACC_FLAGS $(JAVACC_FLAGS)) endif () find_program(DOT NAMES dot) |