Fix syntax error in the main CMakeLists.txt, and fix detection of mac…

…OS when building QScintilla
T-Alx · Mar 17, 2020 · 84ceebd · 84ceebd
1 parent d467af5
commit 84ceebd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/gui/qt/CMakeLists.txt b/app/gui/qt/CMakeLists.txt
@@ -19,7 +19,7 @@ set(APP_ROOT ${CMAKE_CURRENT_LIST_DIR})
 set(SONIC_PI_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../..)
 
 # Set cmake prefix path so it can find the Qt libraries
-if(${BUILD_32BIT} AND DEFINED ENV{QT_INSTALL_LOCATION32})
+if((${BUILD_32BIT}) AND (DEFINED ENV{QT_INSTALL_LOCATION32}))
   message(STATUS "Setting up a 32 bit Qt Build")
   message(STATUS "Setting prefix to user-defined Qt (32-bit) install location: $ENV{QT_INSTALL_LOCATION32}")
   set(CMAKE_PREFIX_PATH $ENV{QT_INSTALL_LOCATION32})

diff --git a/app/gui/qt/external/QScintilla-2.11.4/CMakeLists.txt b/app/gui/qt/external/QScintilla-2.11.4/CMakeLists.txt
@@ -294,7 +294,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES Linux)
         -Wno-strict-overflow
         -Wno-misleading-indentation
     )
-elseif(MACOS)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES Darwin) # macOS
     target_compile_options(QScintilla
     PRIVATE
         -Wno-absolute-value