diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-03-24 19:07:49 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-24 19:07:49 (GMT) |
| commit | 8e133c11e1758dcffa9335850e171519a9d28077 (patch) | |
| tree | 3d944127340f6f5a5db31587a054b33fc2f86505 | |
| parent | 7f8fbc326ba6a9f6bb643983ca12a31b40fa7c00 (diff) | |
| parent | eab35a39804e4ccac521057112f138d3e32efac9 (diff) | |
| download | Doxygen-8e133c11e1758dcffa9335850e171519a9d28077.zip Doxygen-8e133c11e1758dcffa9335850e171519a9d28077.tar.gz Doxygen-8e133c11e1758dcffa9335850e171519a9d28077.tar.bz2 | |
Merge pull request #7666 from albert-github/feature/issue_7664
issue #7664 bigobj not found with MSYS Makefiles
| -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() |