From 1ceb05bf09a2063bba7d93bfcc8d20b6ac0b71d6 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 8 Mar 2014 18:22:30 -0800 Subject: [PATCH] click harder --- animation-server/CMakeLists.txt | 4 ++++ assignment-client/CMakeLists.txt | 4 ++++ cmake/modules/FindFaceshift.cmake | 2 +- domain-server/CMakeLists.txt | 4 ++++ interface/CMakeLists.txt | 4 ++++ libraries/audio/CMakeLists.txt | 4 ++++ libraries/avatars/CMakeLists.txt | 4 ++++ libraries/embedded-webserver/CMakeLists.txt | 4 ++++ libraries/metavoxels/CMakeLists.txt | 4 ++++ libraries/octree/CMakeLists.txt | 4 ++++ libraries/particles/CMakeLists.txt | 4 ++++ libraries/script-engine/CMakeLists.txt | 4 ++++ libraries/shared/CMakeLists.txt | 4 ++++ libraries/voxels/CMakeLists.txt | 5 +++++ tests/metavoxels/CMakeLists.txt | 4 ++++ tests/physics/CMakeLists.txt | 4 ++++ tools/mtc/CMakeLists.txt | 4 ++++ voxel-edit/CMakeLists.txt | 4 ++++ 18 files changed, 70 insertions(+), 1 deletion(-) diff --git a/animation-server/CMakeLists.txt b/animation-server/CMakeLists.txt index 3e33250875..7d3222327a 100644 --- a/animation-server/CMakeLists.txt +++ b/animation-server/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(TARGET_NAME animation-server) set(ROOT_DIR ..) diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt index fe035e3c51..505708a899 100644 --- a/assignment-client/CMakeLists.txt +++ b/assignment-client/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(TARGET_NAME assignment-client) set(ROOT_DIR ..) diff --git a/cmake/modules/FindFaceshift.cmake b/cmake/modules/FindFaceshift.cmake index 0fd7b8779e..c89cbbab6f 100644 --- a/cmake/modules/FindFaceshift.cmake +++ b/cmake/modules/FindFaceshift.cmake @@ -34,7 +34,7 @@ else () # Windows only cares about the headers if (FACESHIFT_INCLUDE_DIRS) set(FACESHIFT_FOUND TRUE) - endif (FACESHIFT_INCLUDE_DIRS AND FACESHIFT_LIBRARIES) + endif (FACESHIFT_INCLUDE_DIRS) else () # Mac and Unix requires libraries if (FACESHIFT_INCLUDE_DIRS AND FACESHIFT_LIBRARIES) diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt index eeaa4dc150..16bdb0df6b 100644 --- a/domain-server/CMakeLists.txt +++ b/domain-server/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(TARGET_NAME domain-server) set(ROOT_DIR ..) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 99133861c1..bdf34e7c5d 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(ROOT_DIR ..) set(MACRO_DIR "${ROOT_DIR}/cmake/macros") diff --git a/libraries/audio/CMakeLists.txt b/libraries/audio/CMakeLists.txt index 30ce287bc3..8d2feb22a2 100644 --- a/libraries/audio/CMakeLists.txt +++ b/libraries/audio/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(ROOT_DIR ../..) set(MACRO_DIR "${ROOT_DIR}/cmake/macros") diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt index 316f1dca58..4cc97e56a5 100644 --- a/libraries/avatars/CMakeLists.txt +++ b/libraries/avatars/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(ROOT_DIR ../..) set(MACRO_DIR "${ROOT_DIR}/cmake/macros") diff --git a/libraries/embedded-webserver/CMakeLists.txt b/libraries/embedded-webserver/CMakeLists.txt index 06dd2d750d..3dc9074332 100644 --- a/libraries/embedded-webserver/CMakeLists.txt +++ b/libraries/embedded-webserver/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(ROOT_DIR ../..) set(MACRO_DIR "${ROOT_DIR}/cmake/macros") diff --git a/libraries/metavoxels/CMakeLists.txt b/libraries/metavoxels/CMakeLists.txt index bab03058a0..acc060b270 100644 --- a/libraries/metavoxels/CMakeLists.txt +++ b/libraries/metavoxels/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(ROOT_DIR ../..) set(MACRO_DIR "${ROOT_DIR}/cmake/macros") diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt index 8b8f37bae7..422089a57d 100644 --- a/libraries/octree/CMakeLists.txt +++ b/libraries/octree/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(ROOT_DIR ../..) set(MACRO_DIR "${ROOT_DIR}/cmake/macros") diff --git a/libraries/particles/CMakeLists.txt b/libraries/particles/CMakeLists.txt index 8f475647bd..b483e3e479 100644 --- a/libraries/particles/CMakeLists.txt +++ b/libraries/particles/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(ROOT_DIR ../..) set(MACRO_DIR "${ROOT_DIR}/cmake/macros") diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt index d91814bcec..615000e260 100644 --- a/libraries/script-engine/CMakeLists.txt +++ b/libraries/script-engine/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(ROOT_DIR ../..) set(MACRO_DIR "${ROOT_DIR}/cmake/macros") diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt index 021d8b33bf..658542637f 100644 --- a/libraries/shared/CMakeLists.txt +++ b/libraries/shared/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(ROOT_DIR ../..) set(MACRO_DIR "${ROOT_DIR}/cmake/macros") diff --git a/libraries/voxels/CMakeLists.txt b/libraries/voxels/CMakeLists.txt index 515c6b6f94..afc0b34b64 100644 --- a/libraries/voxels/CMakeLists.txt +++ b/libraries/voxels/CMakeLists.txt @@ -1,5 +1,10 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + + set(ROOT_DIR ../..) set(MACRO_DIR "${ROOT_DIR}/cmake/macros") diff --git a/tests/metavoxels/CMakeLists.txt b/tests/metavoxels/CMakeLists.txt index 4654d8c353..5f11c7290e 100644 --- a/tests/metavoxels/CMakeLists.txt +++ b/tests/metavoxels/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(TARGET_NAME metavoxel-tests) set(ROOT_DIR ../..) diff --git a/tests/physics/CMakeLists.txt b/tests/physics/CMakeLists.txt index 482e6e0ec3..9b336523f1 100644 --- a/tests/physics/CMakeLists.txt +++ b/tests/physics/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(TARGET_NAME physics-tests) set(ROOT_DIR ../..) diff --git a/tools/mtc/CMakeLists.txt b/tools/mtc/CMakeLists.txt index a9588fd30d..a7ab97c7f2 100644 --- a/tools/mtc/CMakeLists.txt +++ b/tools/mtc/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(TARGET_NAME mtc) set(ROOT_DIR ../..) diff --git a/voxel-edit/CMakeLists.txt b/voxel-edit/CMakeLists.txt index 126775b152..0de8fd059e 100644 --- a/voxel-edit/CMakeLists.txt +++ b/voxel-edit/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if (WIN32) + cmake_policy (SET CMP0020 NEW) +endif (WIN32) + set(TARGET_NAME voxel-edit) set(ROOT_DIR ..)