diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-03-27 21:28:49 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-03-27 21:28:49 (GMT) |
| commit | 08bb311274f4f7402458fd8f0a53d2e8f0bbf998 (patch) | |
| tree | 3cca000e44fc510aa9635e0c349b74a13e8703aa | |
| parent | 3470dd71ff483bc21d92aae936ece9d40de2f861 (diff) | |
| parent | 8e133c11e1758dcffa9335850e171519a9d28077 (diff) | |
| download | Doxygen-08bb311274f4f7402458fd8f0a53d2e8f0bbf998.zip Doxygen-08bb311274f4f7402458fd8f0a53d2e8f0bbf998.tar.gz Doxygen-08bb311274f4f7402458fd8f0a53d2e8f0bbf998.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a9545d0..20c87dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,8 @@ if (CMAKE_SYSTEM MATCHES "Darwin") endif() if (WIN32) - if (NOT CMAKE_GENERATOR MATCHES "MinGW Makefiles") + if ((NOT CMAKE_GENERATOR MATCHES "MinGW Makefiles") AND + (NOT CMAKE_GENERATOR MATCHES "MSYS Makefiles")) if (NOT ICONV_DIR) set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild") endif() |