From 90d7948e0d0aa89e6233839296a2ca744a90b4ab Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Thu, 25 Apr 2019 09:01:10 -0700 Subject: [PATCH] TEST --- CMakeLists.txt | 3 ++- cmake/externals/quazip/CMakeLists.txt | 2 ++ cmake/macros/SetupQt.cmake | 2 ++ hifi_vcpkg.py | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8792d87ad..964d00b37d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/cmake/externals/quazip/CMakeLists.txt b/cmake/externals/quazip/CMakeLists.txt index f99d995a0c..4785fadd40 100644 --- a/cmake/externals/quazip/CMakeLists.txt +++ b/cmake/externals/quazip/CMakeLists.txt @@ -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) diff --git a/cmake/macros/SetupQt.cmake b/cmake/macros/SetupQt.cmake index 6407aaaf04..76b437b397 100644 --- a/cmake/macros/SetupQt.cmake +++ b/cmake/macros/SetupQt.cmake @@ -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() \ No newline at end of file diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py index e1d509b9df..d449de8fa1 100644 --- a/hifi_vcpkg.py +++ b/hifi_vcpkg.py @@ -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