Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 11:37:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into domain-server-auth

Browse source
This commit is contained in:
Stephen Birarda 2014-07-30 17:14:03 -07:00
commit 04effabe48
33 changed files with 30 additions and 184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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 ..)

28
cmake/modules/FindLibOVR.cmake
View file

@ -22,16 +22,13 @@ include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
hifi_library_search_hints("oculus") hifi_library_search_hints("oculus")
find_path(LIBOVR_INCLUDE_DIRS OVR.h PATH_SUFFIXES Include HINTS ${OCULUS_SEARCH_DIRS}) find_path(LIBOVR_INCLUDE_DIRS OVR.h PATH_SUFFIXES Include HINTS ${OCULUS_SEARCH_DIRS})
find_path(LIBOVR_UTIL_INCLUDE_DIR Util_Render_Stereo.h PATH_SUFFIXES Src/Util HINTS ${OCULUS_SEARCH_DIRS}) find_path(LIBOVR_SRC_DIR Util_Render_Stereo.h PATH_SUFFIXES Src/Util HINTS ${OCULUS_SEARCH_DIRS})
# add the util include dir to the general include dirs
set(LIBOVR_INCLUDE_DIRS "${LIBOVR_INCLUDE_DIRS}" "${LIBOVR_UTIL_INCLUDE_DIR}")
include(SelectLibraryConfigurations) include(SelectLibraryConfigurations)
if (APPLE) if (APPLE)
find_library(LIBOVR_LIBRARY_DEBUG "Lib/MacOS/Debug/libovr.a" HINTS ${OCULUS_SEARCH_DIRS}) find_library(LIBOVR_LIBRARY_DEBUG NAMES ovr PATH_SUFFIXES Lib/MacOS/Debug HINTS ${OCULUS_SEARCH_DIRS})
find_library(LIBOVR_LIBRARY_RELEASE "Lib/MacOS/Release/libovr.a" HINTS ${OCULUS_SEARCH_DIRS}) find_library(LIBOVR_LIBRARY_RELEASE NAMES ovr PATH_SUFFIXES Lib/MacOS/Release HINTS ${OCULUS_SEARCH_DIRS})
elseif (UNIX) elseif (UNIX)
find_library(UDEV_LIBRARY_RELEASE udev /usr/lib/x86_64-linux-gnu/) find_library(UDEV_LIBRARY_RELEASE udev /usr/lib/x86_64-linux-gnu/)
find_library(XINERAMA_LIBRARY_RELEASE Xinerama /usr/lib/x86_64-linux-gnu/) find_library(XINERAMA_LIBRARY_RELEASE Xinerama /usr/lib/x86_64-linux-gnu/)
@ -42,26 +39,29 @@ elseif (UNIX)
set(LINUX_ARCH_DIR "x86_64") set(LINUX_ARCH_DIR "x86_64")
endif() endif()
find_library(LIBOVR_LIBRARY_DEBUG "Lib/Linux/Debug/${LINUX_ARCH_DIR}/libovr.a" HINTS ${OCULUS_SEARCH_DIRS}) find_library(LIBOVR_LIBRARY_DEBUG NAMES ovr PATH_SUFFIXES Lib/Linux/Debug/${LINUX_ARCH_DIR} HINTS ${OCULUS_SEARCH_DIRS})
find_library(LIBOVR_LIBRARY_RELEASE "Lib/Linux/Release/${LINUX_ARCH_DIR}/libovr.a" HINTS ${OCULUS_SEARCH_DIRS}) find_library(LIBOVR_LIBRARY_RELEASE NAMES ovr PATH_SUFFIXES Lib/Linux/Release/${LINUX_ARCH_DIR} HINTS ${OCULUS_SEARCH_DIRS})
select_library_configurations(UDEV) select_library_configurations(UDEV)
select_library_configurations(XINERAMA) select_library_configurations(XINERAMA)
elseif (WIN32) elseif (WIN32)
find_library(LIBOVR_LIBRARY_DEBUG "Lib/Win32/libovrd.lib" HINTS ${OCULUS_SEARCH_DIRS}) find_library(LIBOVR_LIBRARY_DEBUG NAMES libovrd PATH_SUFFIXES Lib/Win32/VS2010 HINTS ${OCULUS_SEARCH_DIRS})
find_library(LIBOVR_LIBRARY_RELEASE "Lib/Win32/libovr.lib" HINTS ${OCULUS_SEARCH_DIRS}) find_library(LIBOVR_LIBRARY_RELEASE NAMES libovr PATH_SUFFIXES Lib/Win32/VS2010 HINTS ${OCULUS_SEARCH_DIRS})
endif () endif ()
select_library_configurations(LIBOVR) select_library_configurations(LIBOVR)
set(LIBOVR_LIBRARIES "${LIBOVR_LIBRARY}")
if (UNIX AND NOT APPLE)
set(LIBOVR_LIBRARIES "${LIBOVR_LIBRARIES}" "${UDEV_LIBRARY}" "${XINERAMA_LIBRARY}") set(LIBOVR_LIBRARIES "${LIBOVR_LIBRARIES}" "${UDEV_LIBRARY}" "${XINERAMA_LIBRARY}")
endif ()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
if (UNIX) if (UNIX AND NOT APPLE)
find_package_handle_standard_args(LIBOVR DEFAULT_MSG LIBOVR_INCLUDE_DIRS LIBOVR_UTIL_INCLUDE_DIR LIBOVR_LIBRARIES) find_package_handle_standard_args(LIBOVR DEFAULT_MSG LIBOVR_INCLUDE_DIRS LIBOVR_SRC_DIR LIBOVR_LIBRARIES UDEV_LIBRARY XINERAMA_LIBRARY)
elseif () else ()
find_package_handle_standard_args(LIBOVR DEFAULT_MSG LIBOVR_INCLUDE_DIRS LIBOVR_UTIL_INCLUDE_DIR LIBOVR_LIBRARIES UDEV_LIBRARY XINERAMA_LIBRARY) find_package_handle_standard_args(LIBOVR DEFAULT_MSG LIBOVR_INCLUDE_DIRS LIBOVR_SRC_DIR LIBOVR_LIBRARIES)
endif () endif ()
mark_as_advanced(LIBOVR_INCLUDE_DIRS LIBOVR_LIBRARIES OCULUS_SEARCH_DIRS) mark_as_advanced(LIBOVR_INCLUDE_DIRS LIBOVR_LIBRARIES OCULUS_SEARCH_DIRS)

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")

1
interface/src/devices/OculusManager.h
View file

@ -15,7 +15,6 @@
#ifdef HAVE_LIBOVR #ifdef HAVE_LIBOVR
#include <OVR.h> #include <OVR.h>
#include <Util_Render_Stereo.h>
#endif #endif
#include "renderer/ProgramObject.h" #include "renderer/ProgramObject.h"

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")

3
tests/CMakeLists.txt
View file

@ -1,5 +1,3 @@
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})
@ -7,4 +5,3 @@ foreach(DIR ${TEST_SUBDIRS})
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 ../..)

8
tools/mtc/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 mtc) set(TARGET_NAME mtc)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
@ -11,5 +5,3 @@ 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 ..)