diff options
| -rw-r--r-- | expat/cmake/autotools/expat-config-version.cmake.in | 7 | ||||
| -rw-r--r-- | expat/cmake/autotools/expat.cmake | 2 | ||||
| -rw-r--r-- | expat/lib/winconfig.h | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/expat/cmake/autotools/expat-config-version.cmake.in b/expat/cmake/autotools/expat-config-version.cmake.in index abdda6e9..10fa146f 100644 --- a/expat/cmake/autotools/expat-config-version.cmake.in +++ b/expat/cmake/autotools/expat-config-version.cmake.in @@ -52,13 +52,8 @@ else() endif() -# if the installed project requested no architecture check, don't perform the check -if("FALSE") - return() -endif() - # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it: -if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@ac_cv_sizeof_void_p@" STREQUAL "") +if(CMAKE_SIZEOF_VOID_P STREQUAL "" OR "@ac_cv_sizeof_void_p@" STREQUAL "") return() endif() diff --git a/expat/cmake/autotools/expat.cmake b/expat/cmake/autotools/expat.cmake index 7d737248..88f78939 100644 --- a/expat/cmake/autotools/expat.cmake +++ b/expat/cmake/autotools/expat.cmake @@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.3") message(FATAL_ERROR "CMake >= 2.8.3 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.8.3...3.23) +cmake_policy(VERSION 2.8.3...3.24) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- diff --git a/expat/lib/winconfig.h b/expat/lib/winconfig.h index 2ecd61b5..688b949c 100644 --- a/expat/lib/winconfig.h +++ b/expat/lib/winconfig.h @@ -35,7 +35,9 @@ #ifndef WINCONFIG_H #define WINCONFIG_H -#define WIN32_LEAN_AND_MEAN +#ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #undef WIN32_LEAN_AND_MEAN |