Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 12:57:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed test code.

Browse source
This commit is contained in:
NissimHadar 2019-04-25 10:16:15 -07:00
parent 90d7948e0d
commit 9b22614135
4 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -192,8 +192,7 @@ set_packaging_parameters()
# Locate the required Qt build on the filesystem # Locate the required Qt build on the filesystem
setup_qt() setup_qt()
list(APPEND CMAKE_PREFIX_PATH "${QT_CMAKE_PREFIX_PATH}") list(APPEND CMAKE_PREFIX_PATH "${QT_CMAKE_PREFIX_PATH}")
message("=========================================================================TOP CMakeLists")
message(${QT_CMAKE_PREFIX_PATH})
find_package( Threads ) find_package( Threads )
add_definitions(-DGLM_FORCE_RADIANS) add_definitions(-DGLM_FORCE_RADIANS)

2
cmake/externals/quazip/CMakeLists.txt vendored
View file

@ -11,8 +11,6 @@ set(QUAZIP_CMAKE_ARGS
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-DZLIB_ROOT=${VCPKG_INSTALL_ROOT} -DZLIB_ROOT=${VCPKG_INSTALL_ROOT}
-DCMAKE_POSITION_INDEPENDENT_CODE=ON) -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
message("=========================================================================Quazip CMakeList")
message(${QT_CMAKE_PREFIX_PATH})
if (NOT APPLE) if (NOT APPLE)
set(QUAZIP_CMAKE_ARGS ${QUAZIP_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=11) set(QUAZIP_CMAKE_ARGS ${QUAZIP_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=11)

2
cmake/macros/SetupQt.cmake
View file

@ -43,7 +43,5 @@ macro(setup_qt)
if (WIN32) if (WIN32)
add_paths_to_fixup_libs("${QT_DIR}/bin") add_paths_to_fixup_libs("${QT_DIR}/bin")
endif () endif ()
message("=========================================================================SetupQtMake")
message(${QT_CMAKE_PREFIX_PATH})
endmacro() endmacro()

2
hifi_vcpkg.py
View file

@ -219,8 +219,6 @@ endif()
installPath = os.path.join(self.path, 'installed', self.triplet) installPath = os.path.join(self.path, 'installed', self.triplet)
toolsPath = os.path.join(self.path, 'installed', self.hostTriplet, 'tools') toolsPath = os.path.join(self.path, 'installed', self.hostTriplet, 'tools')
cmakePrefixPath = os.path.join(self.path, 'installed', 'qt5-install/lib/cmake') cmakePrefixPath = os.path.join(self.path, 'installed', 'qt5-install/lib/cmake')
print("==========================================================hifi_vcpkg")
print(cmakePrefixPath)
cmakeTemplate = VcpkgRepo.CMAKE_TEMPLATE cmakeTemplate = VcpkgRepo.CMAKE_TEMPLATE
if not self.args.android: if not self.args.android:
cmakeTemplate += VcpkgRepo.CMAKE_TEMPLATE_NON_ANDROID cmakeTemplate += VcpkgRepo.CMAKE_TEMPLATE_NON_ANDROID