diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-23 12:59:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-23 12:59:54 (GMT) |
| commit | d15a502f8eec903bd25ab5e1e5ce646eff68a4fc (patch) | |
| tree | 5f765f3d8f1b5df22e5dba1c9e9f70381e6c3fe7 | |
| parent | 68b51a57e535f67a6837bc0af5e3b00a225f2154 (diff) | |
| parent | 27591a541c3ee7c0a941295f25610631bf18ca74 (diff) | |
| download | CMake-d15a502f8eec903bd25ab5e1e5ce646eff68a4fc.zip CMake-d15a502f8eec903bd25ab5e1e5ce646eff68a4fc.tar.gz CMake-d15a502f8eec903bd25ab5e1e5ce646eff68a4fc.tar.bz2 | |
Merge topic 'minor-cleanups'
27591a54 Define WIN32_LEAN_AND_MEAN for CMake sources on Windows
481c9003 libarchive: Fix include order in xxhash.c
| -rw-r--r-- | Source/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/xxhash.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index b68675d..e63bf5a 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -45,9 +45,12 @@ endif() set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR}) -# ensure Unicode friendly APIs are used on Windows if(WIN32) + # ensure Unicode friendly APIs are used on Windows add_definitions(-DUNICODE -D_UNICODE) + + # minimize windows.h content + add_definitions(-DWIN32_LEAN_AND_MEAN) endif() # configure the .dox.in file diff --git a/Utilities/cmlibarchive/libarchive/xxhash.c b/Utilities/cmlibarchive/libarchive/xxhash.c index d7f8e96..262fecb 100644 --- a/Utilities/cmlibarchive/libarchive/xxhash.c +++ b/Utilities/cmlibarchive/libarchive/xxhash.c @@ -29,12 +29,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. You can contact the author at : - xxHash source repository : http://code.google.com/p/xxhash/ */ -#include <stdlib.h> -#include <string.h> #include "archive_platform.h" #include "archive_xxhash.h" +#include <stdlib.h> +#include <string.h> + #ifdef HAVE_LIBLZ4 /*************************************** |