Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 03:55:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3225 from birarda/master

Browse source 
cmake file cleanup to suppress warnings on cmake 3.0
This commit is contained in:
Brad Hefta-Gaub 2014-07-30 19:20:18 -07:00
commit d4d4069f11
31 changed files with 15 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CMakeLists.txt
View file

@ -1,9 +1,17 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8.12.2)
if (WIN32) if (WIN32)
cmake_policy (SET CMP0020 NEW) cmake_policy(SET CMP0020 NEW)
endif (WIN32) endif (WIN32)
if (POLICY CMP0028)
cmake_policy(SET CMP0028 OLD)
endif ()
if (POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif ()
project(hifi) project(hifi)
add_definitions(-DGLM_FORCE_RADIANS) add_definitions(-DGLM_FORCE_RADIANS)
@ -39,7 +47,7 @@ set(CMAKE_AUTOMOC ON)
# targets not supported on windows # targets not supported on windows
if (NOT WIN32) if (NOT WIN32)
add_subdirectory(animation-server) add_subdirectory(animation-server)
endif (NOT WIN32) endif ()
# targets on all platforms # targets on all platforms
add_subdirectory(assignment-client) add_subdirectory(assignment-client)

2
animation-server/CMakeLists.txt
View file

@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32) if (WIN32)
cmake_policy (SET CMP0020 NEW) cmake_policy (SET CMP0020 NEW)
endif (WIN32) endif (WIN32)

6
assignment-client/CMakeLists.txt
View file

@ -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(TARGET_NAME assignment-client)
set(ROOT_DIR ..) set(ROOT_DIR ..)

4
cmake/macros/SetupHifiProject.cmake
View file

@ -7,7 +7,7 @@
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html # 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}) project(${TARGET})
# grab the implemenation and header files # grab the implemenation and header files
@ -29,6 +29,6 @@ macro(SETUP_HIFI_PROJECT TARGET INCLUDE_QT)
find_package(Qt5Core REQUIRED) find_package(Qt5Core REQUIRED)
qt5_use_modules(${TARGET} Core) qt5_use_modules(${TARGET} Core)
endif () endif ()
target_link_libraries(${TARGET} ${QT_LIBRARIES}) target_link_libraries(${TARGET} ${QT_LIBRARIES})
endmacro() endmacro()

2
domain-server/CMakeLists.txt
View file

@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32) if (WIN32)
cmake_policy (SET CMP0020 NEW) cmake_policy (SET CMP0020 NEW)
endif (WIN32) endif (WIN32)

6
interface/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ..) set(ROOT_DIR ..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

6
libraries/animation/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

6
libraries/audio/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

6
libraries/avatars/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

6
libraries/embedded-webserver/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

6
libraries/fbx/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

6
libraries/metavoxels/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

6
libraries/models/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

6
libraries/networking/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

6
libraries/octree/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

6
libraries/particles/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

6
libraries/script-engine/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

6
libraries/shared/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

7
libraries/voxels/CMakeLists.txt
View file

@ -1,10 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")

5
tests/CMakeLists.txt
View file

@ -1,10 +1,7 @@
cmake_minimum_required(VERSION 2.8)
# add the test directories # add the test directories
file(GLOB TEST_SUBDIRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*") file(GLOB TEST_SUBDIRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*")
foreach(DIR ${TEST_SUBDIRS}) foreach(DIR ${TEST_SUBDIRS})
if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}") if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}")
add_subdirectory(${DIR}) add_subdirectory(${DIR})
endif() endif()
endforeach() endforeach()

6
tests/audio/CMakeLists.txt
View file

@ -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(TARGET_NAME audio-tests)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)

6
tests/metavoxels/CMakeLists.txt
View file

@ -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(TARGET_NAME metavoxel-tests)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)

6
tests/networking/CMakeLists.txt
View file

@ -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(TARGET_NAME networking-tests)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)

6
tests/octree/CMakeLists.txt
View file

@ -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(TARGET_NAME octree-tests)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)

6
tests/physics/CMakeLists.txt
View file

@ -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(TARGET_NAME physics-tests)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)

6
tests/shared/CMakeLists.txt
View file

@ -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(TARGET_NAME shared-tests)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)

1
tools/CMakeLists.txt
View file

@ -1,4 +1,3 @@
cmake_minimum_required(VERSION 2.8)
# add the tool directories # add the tool directories
add_subdirectory(bitstream2json) add_subdirectory(bitstream2json)

6
tools/bitstream2json/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(TARGET_NAME bitstream2json) set(TARGET_NAME bitstream2json)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)

6
tools/json2bitstream/CMakeLists.txt
View file

@ -1,9 +1,3 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(TARGET_NAME json2bitstream) set(TARGET_NAME json2bitstream)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)

10
tools/mtc/CMakeLists.txt
View file

@ -1,15 +1,7 @@
cmake_minimum_required(VERSION 2.8)
if (WIN32)
cmake_policy (SET CMP0020 NEW)
endif (WIN32)
set(TARGET_NAME mtc) set(TARGET_NAME mtc)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
include(${MACRO_DIR}/SetupHifiProject.cmake) include(${MACRO_DIR}/SetupHifiProject.cmake)
setup_hifi_project(${TARGET_NAME} TRUE) setup_hifi_project(${TARGET_NAME} TRUE)

6
voxel-edit/CMakeLists.txt
View file

@ -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(TARGET_NAME voxel-edit)
set(ROOT_DIR ..) set(ROOT_DIR ..)