From fe29b36b443c7136c2b87119d6eacb1161689d90 Mon Sep 17 00:00:00 2001
From: ksuprynowicz <ksuprynowicz@post.pl>
Date: Sun, 24 Oct 2021 20:34:55 +0200
Subject: [PATCH] Fixed CMake error when there's no CXXFLAGS environment
variable
---
CMakeLists.txt | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 681b391110..53caf10783 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,12 +79,12 @@ endif()
# It's used to determine build flags for main codebase and for VCPKG dependencies.
# Should be set to false to get completely unoptimized build for easier line-by-line debugging
-if(NOT DEFINED VIRCADIA_OPTIMIZE)
- message("Enabling code optimization for Vircadia and compiled dependencies")
- set(VIRCADIA_OPTIMIZE true CACHE BOOL "Enable code optimization for Vircadia and compiled dependencies")
-endif()
-
if( NOT WIN32 )
+ if(NOT DEFINED VIRCADIA_OPTIMIZE)
+ message("Enabling code optimization for Vircadia and compiled dependencies")
+ set(VIRCADIA_OPTIMIZE true CACHE BOOL "Enable code optimization for Vircadia and compiled dependencies")
+ endif()
+
#compiler needs to be detected before building VCPKG dependencies
set(CMAKE_PLATFORM_INFO_DIR "${CMAKE_CURRENT_BINARY_DIR}")
include(CMakeDetermineCXXCompiler)
@@ -130,9 +130,10 @@ if( NOT WIN32 )
set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}")
set(ENV{CFLAGS} "$ENV{CFLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}")
+ message($ENV{CXXFLAGS})
endif()
-message($ENV{CXXFLAGS})
+
if (HIFI_ANDROID)
execute_process(