From 2796f714198c07324b43d95696f63af114557cd3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Jul 2014 15:06:15 -0700 Subject: [PATCH] library cleanup to suppress warnings on cmake 3.0 --- CMakeLists.txt | 7 +++++-- animation-server/CMakeLists.txt | 2 -- assignment-client/CMakeLists.txt | 6 ------ cmake/macros/SetupHifiProject.cmake | 6 +++--- domain-server/CMakeLists.txt | 2 -- interface/CMakeLists.txt | 6 ------ libraries/animation/CMakeLists.txt | 6 ------ libraries/audio/CMakeLists.txt | 6 ------ libraries/avatars/CMakeLists.txt | 6 ------ libraries/embedded-webserver/CMakeLists.txt | 6 ------ libraries/fbx/CMakeLists.txt | 6 ------ libraries/metavoxels/CMakeLists.txt | 6 ------ libraries/models/CMakeLists.txt | 6 ------ libraries/networking/CMakeLists.txt | 6 ------ libraries/octree/CMakeLists.txt | 6 ------ libraries/particles/CMakeLists.txt | 6 ------ libraries/script-engine/CMakeLists.txt | 6 ------ libraries/shared/CMakeLists.txt | 6 ------ libraries/voxels/CMakeLists.txt | 7 ------- tests/CMakeLists.txt | 5 +---- tests/audio/CMakeLists.txt | 6 ------ tests/metavoxels/CMakeLists.txt | 6 ------ tests/networking/CMakeLists.txt | 6 ------ tests/octree/CMakeLists.txt | 6 ------ tests/physics/CMakeLists.txt | 6 ------ tests/shared/CMakeLists.txt | 6 ------ tools/CMakeLists.txt | 1 - tools/bitstream2json/CMakeLists.txt | 6 ------ tools/json2bitstream/CMakeLists.txt | 6 ------ tools/mtc/CMakeLists.txt | 10 +--------- voxel-edit/CMakeLists.txt | 6 ------ 31 files changed, 10 insertions(+), 168 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7c55740a0..91290c6a96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,12 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.12.2) if (WIN32) - cmake_policy (SET CMP0020 NEW) + cmake_policy(SET CMP0020 NEW) endif (WIN32) +cmake_policy(SET CMP0028 OLD) +cmake_policy(SET CMP0043 OLD) + project(hifi) add_definitions(-DGLM_FORCE_RADIANS) diff --git a/animation-server/CMakeLists.txt b/animation-server/CMakeLists.txt index 31ed5d98df..116ee0e942 100644 --- a/animation-server/CMakeLists.txt +++ b/animation-server/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 2.8) - if (WIN32) cmake_policy (SET CMP0020 NEW) endif (WIN32) diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt index 873ae761ca..5ca021b175 100644 --- a/assignment-client/CMakeLists.txt +++ b/assignment-client/CMakeLists.txt @@ -1,9 +1,3 @@ -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/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake index 50cd3a4150..15c70cc2a4 100644 --- a/cmake/macros/SetupHifiProject.cmake +++ b/cmake/macros/SetupHifiProject.cmake @@ -7,7 +7,7 @@ # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html # -macro(SETUP_HIFI_PROJECT TARGET INCLUDE_QT) +macro(SETUP_HIFI_PROJECT TARGET INCLUDE_QT) project(${TARGET}) # grab the implemenation and header files @@ -25,10 +25,10 @@ macro(SETUP_HIFI_PROJECT TARGET INCLUDE_QT) # add the executable, include additional optional sources add_executable(${TARGET} ${TARGET_SRCS} ${ARGN}) - if (${INCLUDE_QT}) + if (INCLUDE_QT) find_package(Qt5Core REQUIRED) qt5_use_modules(${TARGET} Core) endif () - + target_link_libraries(${TARGET} ${QT_LIBRARIES}) endmacro() \ No newline at end of file diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt index f9bbeb31fc..6ee794f7c6 100644 --- a/domain-server/CMakeLists.txt +++ b/domain-server/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 2.8) - if (WIN32) cmake_policy (SET CMP0020 NEW) endif (WIN32) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index c549440334..7336b55852 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -1,9 +1,3 @@ -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/animation/CMakeLists.txt b/libraries/animation/CMakeLists.txt index 1e33f50659..b1dc59fff8 100644 --- a/libraries/animation/CMakeLists.txt +++ b/libraries/animation/CMakeLists.txt @@ -1,9 +1,3 @@ -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 fafdfc7e6c..2ad8a4b0bc 100644 --- a/libraries/audio/CMakeLists.txt +++ b/libraries/audio/CMakeLists.txt @@ -1,9 +1,3 @@ -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 fc398fc33d..ca4a2630b4 100644 --- a/libraries/avatars/CMakeLists.txt +++ b/libraries/avatars/CMakeLists.txt @@ -1,9 +1,3 @@ -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 3dc9074332..1386bcc392 100644 --- a/libraries/embedded-webserver/CMakeLists.txt +++ b/libraries/embedded-webserver/CMakeLists.txt @@ -1,9 +1,3 @@ -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/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt index bc5ac3b3c4..45d1051dc6 100644 --- a/libraries/fbx/CMakeLists.txt +++ b/libraries/fbx/CMakeLists.txt @@ -1,9 +1,3 @@ -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 79c07c6c47..c79631ce06 100644 --- a/libraries/metavoxels/CMakeLists.txt +++ b/libraries/metavoxels/CMakeLists.txt @@ -1,9 +1,3 @@ -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/models/CMakeLists.txt b/libraries/models/CMakeLists.txt index 06578371cc..8056d215da 100644 --- a/libraries/models/CMakeLists.txt +++ b/libraries/models/CMakeLists.txt @@ -1,9 +1,3 @@ -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/networking/CMakeLists.txt b/libraries/networking/CMakeLists.txt index fdd2d5830a..9a13374a4f 100644 --- a/libraries/networking/CMakeLists.txt +++ b/libraries/networking/CMakeLists.txt @@ -1,9 +1,3 @@ -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 5988b4b058..031f7ef69a 100644 --- a/libraries/octree/CMakeLists.txt +++ b/libraries/octree/CMakeLists.txt @@ -1,9 +1,3 @@ -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 dbf2995293..76b3373466 100644 --- a/libraries/particles/CMakeLists.txt +++ b/libraries/particles/CMakeLists.txt @@ -1,9 +1,3 @@ -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 d0d05df286..2dd40c7ece 100644 --- a/libraries/script-engine/CMakeLists.txt +++ b/libraries/script-engine/CMakeLists.txt @@ -1,9 +1,3 @@ -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 560546473c..f099f424e9 100644 --- a/libraries/shared/CMakeLists.txt +++ b/libraries/shared/CMakeLists.txt @@ -1,9 +1,3 @@ -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 51b83bb650..2ae35da2c0 100644 --- a/libraries/voxels/CMakeLists.txt +++ b/libraries/voxels/CMakeLists.txt @@ -1,10 +1,3 @@ -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/CMakeLists.txt b/tests/CMakeLists.txt index 2f56d337fa..dd2e6e396e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,10 +1,7 @@ -cmake_minimum_required(VERSION 2.8) - # add the test directories file(GLOB TEST_SUBDIRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*") foreach(DIR ${TEST_SUBDIRS}) if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}") add_subdirectory(${DIR}) endif() -endforeach() - +endforeach() \ No newline at end of file diff --git a/tests/audio/CMakeLists.txt b/tests/audio/CMakeLists.txt index 5c5178cb71..b7375a0086 100644 --- a/tests/audio/CMakeLists.txt +++ b/tests/audio/CMakeLists.txt @@ -1,9 +1,3 @@ -cmake_minimum_required(VERSION 2.8) - -if (WIN32) - cmake_policy (SET CMP0020 NEW) -endif (WIN32) - set(TARGET_NAME audio-tests) set(ROOT_DIR ../..) diff --git a/tests/metavoxels/CMakeLists.txt b/tests/metavoxels/CMakeLists.txt index ca141c5137..f4c0695362 100644 --- a/tests/metavoxels/CMakeLists.txt +++ b/tests/metavoxels/CMakeLists.txt @@ -1,9 +1,3 @@ -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/networking/CMakeLists.txt b/tests/networking/CMakeLists.txt index 2e094d2ce7..64b5f273d1 100644 --- a/tests/networking/CMakeLists.txt +++ b/tests/networking/CMakeLists.txt @@ -1,9 +1,3 @@ -cmake_minimum_required(VERSION 2.8) - -if (WIN32) - cmake_policy (SET CMP0020 NEW) -endif (WIN32) - set(TARGET_NAME networking-tests) set(ROOT_DIR ../..) diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index 9c5e031d74..c7a6500b6d 100644 --- a/tests/octree/CMakeLists.txt +++ b/tests/octree/CMakeLists.txt @@ -1,9 +1,3 @@ -cmake_minimum_required(VERSION 2.8) - -if (WIN32) - cmake_policy (SET CMP0020 NEW) -endif (WIN32) - set(TARGET_NAME octree-tests) set(ROOT_DIR ../..) diff --git a/tests/physics/CMakeLists.txt b/tests/physics/CMakeLists.txt index 9b336523f1..643d318f7d 100644 --- a/tests/physics/CMakeLists.txt +++ b/tests/physics/CMakeLists.txt @@ -1,9 +1,3 @@ -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/tests/shared/CMakeLists.txt b/tests/shared/CMakeLists.txt index b9513e3f26..0785314d36 100644 --- a/tests/shared/CMakeLists.txt +++ b/tests/shared/CMakeLists.txt @@ -1,9 +1,3 @@ -cmake_minimum_required(VERSION 2.8) - -if (WIN32) - cmake_policy (SET CMP0020 NEW) -endif (WIN32) - set(TARGET_NAME shared-tests) set(ROOT_DIR ../..) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 79db82e90f..c9c0690cc7 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 2.8) # add the tool directories add_subdirectory(bitstream2json) diff --git a/tools/bitstream2json/CMakeLists.txt b/tools/bitstream2json/CMakeLists.txt index d5b82adbd9..576406e787 100644 --- a/tools/bitstream2json/CMakeLists.txt +++ b/tools/bitstream2json/CMakeLists.txt @@ -1,9 +1,3 @@ -cmake_minimum_required(VERSION 2.8) - -if (WIN32) - cmake_policy (SET CMP0020 NEW) -endif (WIN32) - set(TARGET_NAME bitstream2json) set(ROOT_DIR ../..) diff --git a/tools/json2bitstream/CMakeLists.txt b/tools/json2bitstream/CMakeLists.txt index b93c57b582..5ff4673298 100644 --- a/tools/json2bitstream/CMakeLists.txt +++ b/tools/json2bitstream/CMakeLists.txt @@ -1,9 +1,3 @@ -cmake_minimum_required(VERSION 2.8) - -if (WIN32) - cmake_policy (SET CMP0020 NEW) -endif (WIN32) - set(TARGET_NAME json2bitstream) set(ROOT_DIR ../..) diff --git a/tools/mtc/CMakeLists.txt b/tools/mtc/CMakeLists.txt index a7ab97c7f2..582c5e3bfd 100644 --- a/tools/mtc/CMakeLists.txt +++ b/tools/mtc/CMakeLists.txt @@ -1,15 +1,7 @@ -cmake_minimum_required(VERSION 2.8) - -if (WIN32) - cmake_policy (SET CMP0020 NEW) -endif (WIN32) - set(TARGET_NAME mtc) set(ROOT_DIR ../..) set(MACRO_DIR "${ROOT_DIR}/cmake/macros") include(${MACRO_DIR}/SetupHifiProject.cmake) -setup_hifi_project(${TARGET_NAME} TRUE) - - +setup_hifi_project(${TARGET_NAME} TRUE) \ No newline at end of file diff --git a/voxel-edit/CMakeLists.txt b/voxel-edit/CMakeLists.txt index 6ebf23efba..006dfb0599 100644 --- a/voxel-edit/CMakeLists.txt +++ b/voxel-edit/CMakeLists.txt @@ -1,9 +1,3 @@ -cmake_minimum_required(VERSION 2.8) - -if (WIN32) - cmake_policy (SET CMP0020 NEW) -endif (WIN32) - set(TARGET_NAME voxel-edit) set(ROOT_DIR ..)