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

Removing some dev modifications

Browse source
This commit is contained in:
Brad Davis 2015-02-03 23:30:43 -08:00
parent 0dcf5b001f
commit 8ca70c9e80
4 changed files with 1 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
cmake/macros/IncludeOGLPLUS.cmake
View file

@ -1,27 +0,0 @@
#
# IncludeOGLPLUS.cmake
#
# Copyright 2013 High Fidelity, Inc.
#
# Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
#
macro(INCLUDE_OGLPLUS)
find_package(OGLPLUS REQUIRED)
find_package(BOOSTCONFIG REQUIRED)
include_directories("${OGLPLUS_INCLUDE_DIRS}")
include_directories("${BOOSTCONFIG_INCLUDE_DIRS}")
if (APPLE OR UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGLPLUS_INCLUDE_DIRS}")
endif ()
# force oglplus to work in header only mode, use GLEW for GL definitions
# and use boostconfig to determine compiler feature support.
add_definitions(-DOGLPLUS_NO_SITE_CONFIG=1)
add_definitions(-DOGLPLUS_USE_GLEW=1)
add_definitions(-DOGLPLUS_USE_GLCOREARB=0)
add_definitions(-DOGLPLUS_USE_BOOST_CONFIG=1)
endmacro(INCLUDE_OGLPLUS)

26
cmake/modules/FindBoostConfig.cmake
View file

@ -1,26 +0,0 @@
#
# FindBOOSTCONFIG.cmake
#
# Try to find BOOSTCONFIG include path.
# Once done this will define
#
# BOOSTCONFIG_INCLUDE_DIRS
#
# Created on 1/30/2015 by Brad Davis
#
# Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
#
# setup hints for BOOSTCONFIG search
include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
hifi_library_search_hints("boostconfig")
# locate header
find_path(BOOSTCONFIG_INCLUDE_DIR "boost/config.hpp" PATH_SUFFIXES include HINTS ${BOOSTCONFIG_SEARCH_DIRS})
set(BOOSTCONFIG_INCLUDE_DIRS "${BOOSTCONFIG_INCLUDE_DIR}")
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(BOOSTCONFIG DEFAULT_MSG BOOSTCONFIG_INCLUDE_DIRS)
mark_as_advanced(BOOSTCONFIG_INCLUDE_DIRS BOOSTCONFIG_SEARCH_DIRS)

27
cmake/modules/FindOGLPLUS.cmake
View file

@ -1,27 +0,0 @@
#
# FindOGLPLUS.cmake
#
# Try to find OGLPLUS include path.
# Once done this will define
#
# OGLPLUS_INCLUDE_DIRS
#
# Created on 1/30/2015 by Brad Davis
#
# Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
#
# setup hints for OGLPLUS search
include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
hifi_library_search_hints("oglplus")
# locate header
find_path(OGLPLUS_INCLUDE_DIR "oglplus/all.hpp" PATH_SUFFIXES include HINTS ${OGLPLUS_SEARCH_DIRS})
set(OGLPLUS_INCLUDE_DIRS "${OGLPLUS_INCLUDE_DIR}")
list(APPEND OGLPLUS_INCLUDE_DIRS "${OGLPLUS_INCLUDE_DIR}/../implement")
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(OGLPLUS DEFAULT_MSG OGLPLUS_INCLUDE_DIRS)
mark_as_advanced(OGLPLUS_INCLUDE_DIRS OGLPLUS_SEARCH_DIRS)

2
interface/CMakeLists.txt
View file

@ -238,7 +238,7 @@ else (APPLE)
target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} "${NSIGHT_LIBRARIES}" wsock32.lib opengl32.lib Winmm.lib)
# try to find the Nsight package and add it to the build if we find it
#find_package(NSIGHT)
find_package(NSIGHT)
if (NSIGHT_FOUND)
include_directories(${NSIGHT_INCLUDE_DIRS})
add_definitions(-DNSIGHT_FOUND)