diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2018-12-07 12:04:43 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2018-12-07 12:04:43 +0300 |
| commit | 9fbef38247aaacde2082cfc0bf174410e9c00bb1 (patch) | |
| tree | fc9f501dd473a6d8d629150836efbe636ca2a1ce /CMakeLists.txt | |
| parent | 25f22ed06ee53a8626ce2c443e33051e6f93d315 (diff) | |
| parent | bc04dcf863e3a7cd362619ac0dcbeca68ee021f4 (diff) | |
Merge remote-tracking branch 'owncloud/vfs-master'
Conflicts:
src/libsync/filesystem.cpp
src/libsync/filesystem.h
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a80e43ec5..951fb7338 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,11 @@ set(CMAKE_CXX_STANDARD 14) project(client) +if(UNIT_TESTING) + include(CTest) + enable_testing() +endif() + set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") include("${CMAKE_CURRENT_LIST_DIR}/THEME.cmake") @@ -158,8 +163,9 @@ if( WIN32 ) add_definitions( -D__USE_MINGW_ANSI_STDIO=1 ) add_definitions( -DNOMINMAX ) # Get APIs from from Vista onwards. -add_definitions( -D_WIN32_WINNT=0x0600) -add_definitions( -DWINVER=0x0600) +add_definitions(-D_WIN32_WINNT=0x0600) +add_definitions(-DWINVER=0x0600) +add_definitions(-DNTDDI_VERSION=0x0A000003) endif( WIN32 ) if (APPLE) @@ -187,8 +193,6 @@ if(BUILD_SHELL_INTEGRATION) endif() if(UNIT_TESTING) - include(CTest) - enable_testing() add_subdirectory(test) endif(UNIT_TESTING) |