kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'minor-cleanups'

Browse Source 
27591a54 Define WIN32_LEAN_AND_MEAN for CMake sources on Windows
481c9003 libarchive: Fix include order in xxhash.c
This commit is contained in:
Brad King 2016-08-23 08:59:54 -04:00 committed by CMake Topic Stage
commit d15a502f8e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/CMakeLists.txt
View File

@ -45,9 +45,12 @@ endif()
set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR}) set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
# ensure Unicode friendly APIs are used on Windows
if(WIN32) if(WIN32)
# ensure Unicode friendly APIs are used on Windows
add_definitions(-DUNICODE -D_UNICODE) add_definitions(-DUNICODE -D_UNICODE)
# minimize windows.h content
add_definitions(-DWIN32_LEAN_AND_MEAN)
endif() endif()
# configure the .dox.in file # configure the .dox.in file

5
Utilities/cmlibarchive/libarchive/xxhash.c
View File

@ -29,12 +29,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You can contact the author at : You can contact the author at :
- xxHash source repository : http://code.google.com/p/xxhash/ - xxHash source repository : http://code.google.com/p/xxhash/
*/ */
#include <stdlib.h>
#include <string.h>
#include "archive_platform.h" #include "archive_platform.h"
#include "archive_xxhash.h" #include "archive_xxhash.h"
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_LIBLZ4 #ifdef HAVE_LIBLZ4
/*************************************** /***************************************