diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2014-03-03 13:32:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-04 15:19:28 (GMT) |
| commit | f096786d5428505f8313f6b01f4631f5a34b27a2 (patch) | |
| tree | 08bf378742ee9bde2006ba48d0e0ab5369ca0741 /CMakeLists.txt | |
| parent | 4709c7ad4eb4d11d653f552b9ac1f39af5cc1014 (diff) | |
| download | CMake-f096786d5428505f8313f6b01f4631f5a34b27a2.zip CMake-f096786d5428505f8313f6b01f4631f5a34b27a2.tar.gz CMake-f096786d5428505f8313f6b01f4631f5a34b27a2.tar.bz2 | |
KWSys 2014-03-03 (b1916e0a)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ b1916e0a | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 606d7d6f..b1916e0a
Adrien Destugues (1):
b1916e0a SystemInformation: Update CPU count code for Haiku
Clinton Stimpson (3):
0d8ef429 Encoding: Help enforce the use of wide apis on Windows.
cfbc1cc8 FStream: Remove unused basic_filebuf declaration.
b3b20cc0 FStream: Add ability to detect BOM.
Jiri Malak (1):
e66d99b8 SystemTools: Fix compilation with Open Watcom
Matt McCormick (1):
b3db597b SystemInformation: Mark EXECINFO_LIB as advanced
Change-Id: I154a92be7a3ec4c7c12bffbfcd7b50ec7de53c5f
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 736e30a..083d865 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -682,6 +682,7 @@ IF(KWSYS_USE_SystemInformation) # usually it's in libc but on FreeBSD # it's in libexecinfo FIND_LIBRARY(EXECINFO_LIB "execinfo") + MARK_AS_ADVANCED(EXECINFO_LIB) IF (NOT EXECINFO_LIB) SET(EXECINFO_LIB "") ENDIF() @@ -1073,6 +1074,11 @@ IF(MSVC OR (WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")) ) ENDIF() +IF(WIN32) + # Help enforce the use of wide Windows apis. + ADD_DEFINITIONS(-DUNICODE -D_UNICODE) +ENDIF() + IF(KWSYS_USE_String) # Activate code in "String.c". See the comment in the source. SET_SOURCE_FILES_PROPERTIES(String.c PROPERTIES |