diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-12-21 14:04:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 14:04:23 (GMT) |
| commit | c43e80e2b2138212f435e08b8e984f3c4791f3c5 (patch) | |
| tree | 4a57a23a8686870aef0a2bf211bbfe417c641353 | |
| parent | 7af8870a020ad2f85dccd041c04b83d6310337f1 (diff) | |
| parent | 7eff1f27f6edd509f2c5c472cd76d13691cd437a (diff) | |
| download | Doxygen-c43e80e2b2138212f435e08b8e984f3c4791f3c5.zip Doxygen-c43e80e2b2138212f435e08b8e984f3c4791f3c5.tar.gz Doxygen-c43e80e2b2138212f435e08b8e984f3c4791f3c5.tar.bz2 | |
Merge pull request #8239 from nwrkbiz/linux-windows-crossbuild
Update CMakeLists.txt
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fe0ab42..06b9696 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,8 @@ endif() if (WIN32) if ((NOT CMAKE_GENERATOR MATCHES "MinGW Makefiles") AND - (NOT CMAKE_GENERATOR MATCHES "MSYS Makefiles")) + (NOT CMAKE_GENERATOR MATCHES "MSYS Makefiles") AND + (NOT CMAKE_GENERATOR MATCHES "Unix Makefiles")) if (NOT ICONV_DIR) set(ICONV_DIR "${PROJECT_SOURCE_DIR}/winbuild") endif() |