mirror of
https://github.com/lubosz/overte.git
synced 2025-04-07 00:02:37 +02:00
TEST
This commit is contained in:
parent
450bc96c39
commit
90d7948e0d
4 changed files with 8 additions and 1 deletions
|
@ -192,7 +192,8 @@ set_packaging_parameters()
|
|||
# Locate the required Qt build on the filesystem
|
||||
setup_qt()
|
||||
list(APPEND CMAKE_PREFIX_PATH "${QT_CMAKE_PREFIX_PATH}")
|
||||
|
||||
message("=========================================================================TOP CMakeLists")
|
||||
message(${QT_CMAKE_PREFIX_PATH})
|
||||
find_package( Threads )
|
||||
|
||||
add_definitions(-DGLM_FORCE_RADIANS)
|
||||
|
|
2
cmake/externals/quazip/CMakeLists.txt
vendored
2
cmake/externals/quazip/CMakeLists.txt
vendored
|
@ -11,6 +11,8 @@ set(QUAZIP_CMAKE_ARGS
|
|||
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
|
||||
-DZLIB_ROOT=${VCPKG_INSTALL_ROOT}
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON)
|
||||
message("=========================================================================Quazip CMakeList")
|
||||
message(${QT_CMAKE_PREFIX_PATH})
|
||||
|
||||
if (NOT APPLE)
|
||||
set(QUAZIP_CMAKE_ARGS ${QUAZIP_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=11)
|
||||
|
|
|
@ -43,5 +43,7 @@ macro(setup_qt)
|
|||
if (WIN32)
|
||||
add_paths_to_fixup_libs("${QT_DIR}/bin")
|
||||
endif ()
|
||||
message("=========================================================================SetupQtMake")
|
||||
message(${QT_CMAKE_PREFIX_PATH})
|
||||
|
||||
endmacro()
|
|
@ -219,6 +219,8 @@ endif()
|
|||
installPath = os.path.join(self.path, 'installed', self.triplet)
|
||||
toolsPath = os.path.join(self.path, 'installed', self.hostTriplet, 'tools')
|
||||
cmakePrefixPath = os.path.join(self.path, 'installed', 'qt5-install/lib/cmake')
|
||||
print("==========================================================hifi_vcpkg")
|
||||
print(cmakePrefixPath)
|
||||
cmakeTemplate = VcpkgRepo.CMAKE_TEMPLATE
|
||||
if not self.args.android:
|
||||
cmakeTemplate += VcpkgRepo.CMAKE_TEMPLATE_NON_ANDROID
|
||||
|
|
Loading…
Reference in a new issue