diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2017-07-08 19:33:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-08 19:33:25 (GMT) |
| commit | daa2c0960aa5044990c3e06afe8c15694e8be48d (patch) | |
| tree | b540fe5b289d5004502951647835cf845e8e6456 | |
| parent | e30e9443c063b2629f1021385d7c72d20a865c7e (diff) | |
| parent | 9532e0f19532e9d76c3f1092d131af91125a2dff (diff) | |
| download | Doxygen-daa2c0960aa5044990c3e06afe8c15694e8be48d.zip Doxygen-daa2c0960aa5044990c3e06afe8c15694e8be48d.tar.gz Doxygen-daa2c0960aa5044990c3e06afe8c15694e8be48d.tar.bz2 | |
Merge pull request #579 from AdrianDC/mingw
CMakeLists: Avoid MSVC iconv changes for MinGW builds
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6127de2..4d75659 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,12 +48,14 @@ if (${CMAKE_SYSTEM} MATCHES "Darwin") endif() if (WIN32) - if(NOT ICONV_DIR) - set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild") + if (NOT "${CMAKE_GENERATOR}" MATCHES ".*MinGW Makefiles.*") + if (NOT ICONV_DIR) + set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild") + endif() + set(CMAKE_REQUIRED_DEFINITIONS "-DLIBICONV_STATIC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # needed for language.cpp on 64bit + add_definitions(-DLIBICONV_STATIC -D_CRT_SECURE_NO_WARNINGS) endif() - set(CMAKE_REQUIRED_DEFINITIONS "-DLIBICONV_STATIC") - 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 "Ninja") |