NatLabRockies · mitchute · Jun 5, 2026 · May 27, 2026 · May 27, 2026 · May 27, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -92,6 +92,11 @@ option(USE_GLYCOL_CACHING "Use glycol cashing routines" ON)
 option(USE_PSYCH_STATS "Compute psychrometric stats" OFF)
 option(USE_PSYCH_ERRORS "Report psychrometric errors " ON)
 
+if(APPLE AND CMAKE_GENERATOR STREQUAL "Xcode" AND OPENGL_FOUND)
+  set(OPENGL_FOUND FALSE)
+  message(STATUS "Disabling OpenGL for Xcode-generated builds to avoid Cocoa window creation during build/test execution")
+endif()
+
 mark_as_advanced(BUILD_OBJEXXFCL_TESTING)
 
 #######################################################################

diff --git a/cmake/ProjectMacros.cmake b/cmake/ProjectMacros.cmake
@@ -83,9 +83,16 @@ macro(CREATE_TEST_TARGETS BASE_NAME SRC DEPENDENCIES USE_PCH)
 
     target_link_libraries(${BASE_NAME}_tests PRIVATE ${ALL_DEPENDENCIES} gtest)
 
+    if(APPLE AND CMAKE_GENERATOR STREQUAL "Xcode")
+      set(_gtest_discovery_mode PRE_TEST)
+    else()
+      set(_gtest_discovery_mode POST_BUILD)
+    endif()
+
     gtest_discover_tests(${BASE_NAME}_tests
-            DISCOVERY_TIMEOUT 30
-            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+      DISCOVERY_MODE ${_gtest_discovery_mode}
+      DISCOVERY_TIMEOUT 30
     )
 
   endif()

diff --git a/idd/CMakeLists.txt b/idd/CMakeLists.txt
@@ -14,6 +14,7 @@ add_custom_command(
 
 add_executable(generate_embeddable_epJSON_schema embedded/generate_embeddable_epJSON_schema.cpp)
 target_link_libraries(generate_embeddable_epJSON_schema PRIVATE project_options project_fp_options project_warnings fmt::fmt)
+target_compile_options(generate_embeddable_epJSON_schema PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,Clang,AppleClang>:-Wno-shorten-64-to-32>)
 set_target_properties(generate_embeddable_epJSON_schema PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/scripts")
 # See https://en.cppreference.com/w/cpp/filesystem#Notes
 if ((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.1) OR

diff --git a/src/EnergyPlus/AirflowNetwork/CMakeLists.txt b/src/EnergyPlus/AirflowNetwork/CMakeLists.txt
@@ -19,4 +19,4 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_C
 endif()
 
 target_include_directories(airflownetworklib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
-target_link_libraries(airflownetworklib PUBLIC btwxt fmt::fmt)
+target_link_libraries(airflownetworklib PUBLIC btwxt fmt::fmt PRIVATE nlohmann_json)
diff --git a/src/EnergyPlus/UtilityRoutines.hh b/src/EnergyPlus/UtilityRoutines.hh
@@ -412,13 +412,13 @@ namespace Util {
     inline int FindIntInList(Array1_int &list, int item)
     {
         auto it = std::find(list.begin(), list.end(), item);
-        return (it == list.end()) ? -1 : (it - list.begin());
+        return (it == list.end()) ? -1 : static_cast<int>(it - list.begin());
     }
 
     inline int FindIntInList(std::vector<int> &list, int item)
     {
         auto it = std::find(list.begin(), list.end(), item);
-        return (it == list.end()) ? -1 : (it - list.begin());
+        return (it == list.end()) ? -1 : static_cast<int>(it - list.begin());
     }
 
     int FindItemInList(std::string_view const String, Array1S_string const ListOfItems, int NumItems);

diff --git a/third_party/BCVTB/CMakeLists.txt b/third_party/BCVTB/CMakeLists.txt
@@ -17,6 +17,7 @@ IF (UNIX)
 ENDIF()
 
 ADD_LIBRARY( bcvtb STATIC ${SRC} )
+target_compile_options(bcvtb PRIVATE $<$<COMPILE_LANG_AND_ID:C,AppleClang>:-Wno-shorten-64-to-32>)
 
 IF( WIN32 )
   TARGET_LINK_LIBRARIES( bcvtb wsock32 )
@@ -28,4 +29,3 @@ set_target_properties(
   INSTALL_NAME_DIR "@executable_path"
 )
 
-
diff --git a/third_party/CLI/CLI11.hpp b/third_party/CLI/CLI11.hpp
@@ -158,7 +158,9 @@
 #endif
 
 /** <codecvt> availability */
-#if defined(__GNUC__) && !defined(__llvm__) && !defined(__INTEL_COMPILER) && __GNUC__ < 5
+#if defined(__APPLE__) && defined(__clang__)
+#define CLI11_HAS_CODECVT 0
+#elif defined(__GNUC__) && !defined(__llvm__) && !defined(__INTEL_COMPILER) && __GNUC__ < 5
 #define CLI11_HAS_CODECVT 0
 #else
 #define CLI11_HAS_CODECVT 1

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -11,13 +11,14 @@ target_compile_definitions(
 if(NOT MSVC)  # This is really only needed with newer Clang, but gcc is fine with it
   target_compile_options(nlohmann_json INTERFACE -Wno-deprecated-declarations)
 endif()
+target_compile_options(nlohmann_json INTERFACE $<$<COMPILE_LANG_AND_ID:CXX,AppleClang>:-Wno-shorten-64-to-32>)
 target_include_directories(
         nlohmann_json
         SYSTEM INTERFACE
-        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/nlohmann>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 set_source_files_properties(
-  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/nlohmann>/json.hpp
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/nlohmann/json.hpp
   TARGET_DIRECTORY nlohmann_json
   PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations
 )
@@ -133,6 +134,15 @@ if(BUILD_TESTING)
   set_target_properties(gtest_main PROPERTIES FOLDER ThirdParty/gtest)
   set_target_properties(gmock PROPERTIES FOLDER ThirdParty/gtest)
   set_target_properties(gmock_main PROPERTIES FOLDER ThirdParty/gtest)
+  foreach(_gtest_target gtest gtest_main gmock gmock_main)
+    if(TARGET ${_gtest_target})
+      target_compile_options(${_gtest_target}
+        PRIVATE
+          $<$<COMPILE_LANG_AND_ID:CXX,Clang>:-Wno-character-conversion>
+          $<$<COMPILE_LANG_AND_ID:CXX,Clang,AppleClang>:-Wno-deprecated-declarations>
+      )
+    endif()
+  endforeach()
 endif()
 
 add_subdirectory(ObjexxFCL)
@@ -162,6 +172,8 @@ set_target_properties(re2 PROPERTIES FOLDER ThirdParty/re2)
 add_subdirectory(fmt-8.0.1)
 target_compile_definitions(fmt PRIVATE FMT_USE_FULL_CACHE_DRAGONBOX=1)
 set_target_properties(fmt PROPERTIES FOLDER ThirdParty/fmt)
+target_compile_options(fmt PUBLIC $<$<COMPILE_LANG_AND_ID:CXX,Clang>:-Wno-deprecated-literal-operator>)
+target_compile_definitions(fmt PUBLIC $<$<COMPILE_LANG_AND_ID:CXX,Clang,AppleClang>:FMT_CONSTEVAL=>)
 mark_as_advanced(FORCE FMT_SYSTEM_HEADERS)
 
 # Kiva
@@ -224,4 +236,3 @@ add_subdirectory(libtk205)
 mark_as_advanced(FORCE libtk205_STATIC_LIB)
 mark_as_advanced(FORCE libtk205_COVERAGE)
 mark_as_advanced(FORCE libtk205_BUILD_TESTING)
-
diff --git a/third_party/Expat/CMakeLists.txt b/third_party/Expat/CMakeLists.txt
@@ -27,11 +27,11 @@ IF ( CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
 ENDIF()
 
 add_library(epexpat STATIC ${epexpat_SRCS})
+target_compile_options(epexpat PRIVATE $<$<COMPILE_LANG_AND_ID:C,AppleClang>:-Wno-shorten-64-to-32>)
 
 set_target_properties(
   epexpat
   PROPERTIES
   INSTALL_NAME_DIR "@executable_path"
 )
 
-
diff --git a/third_party/SQLite/CMakeLists.txt b/third_party/SQLite/CMakeLists.txt
@@ -2,6 +2,8 @@ set(SRC sqlite3.h sqlite3.c)
 
 add_library(sqlite ${SRC})
 
+target_compile_options(sqlite PRIVATE $<$<COMPILE_LANG_AND_ID:C,AppleClang>:-Wno-shorten-64-to-32>)
+
 if(MSVC) # visual c++ (VS 2013)
   target_compile_options(sqlite PRIVATE -W0)                                                
 elseif(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")# g++/Clang

diff --git a/third_party/btwxt/vendor/courierr/test/CMakeLists.txt b/third_party/btwxt/vendor/courierr/test/CMakeLists.txt
@@ -6,4 +6,4 @@ target_link_libraries(${PROJECT_NAME}_tests PRIVATE ${PROJECT_NAME} gtest fmt)
 target_compile_features(${PROJECT_NAME}_tests PRIVATE cxx_std_17)
 
 include(GoogleTest)
-gtest_discover_tests(${PROJECT_NAME}_tests)
+gtest_discover_tests(${PROJECT_NAME}_tests)
diff --git a/third_party/fmt-8.0.1/include/fmt/format.h b/third_party/fmt-8.0.1/include/fmt/format.h
@@ -2867,7 +2867,7 @@ constexpr auto operator""_a()
   return {};
 }
 #  else
-constexpr auto operator"" _a(const char* s, size_t) -> detail::udl_arg<char> {
+constexpr auto operator""_a(const char* s, size_t) -> detail::udl_arg<char> {
   return {s};
 }
 #  endif
@@ -2882,7 +2882,7 @@ constexpr auto operator"" _a(const char* s, size_t) -> detail::udl_arg<char> {
     std::string message = "The answer is {}"_format(42);
   \endrst
  */
-constexpr auto operator"" _format(const char* s, size_t n)
+constexpr auto operator""_format(const char* s, size_t n)
     -> detail::udl_formatter<char> {
   return {{s, n}};
 }

diff --git a/third_party/gtest/googletest/include/gtest/gtest-printers.h b/third_party/gtest/googletest/include/gtest/gtest-printers.h
@@ -475,7 +475,7 @@ inline void PrintTo(char16_t c, ::std::ostream* os) {
 }
 #ifdef __cpp_char8_t
 inline void PrintTo(char8_t c, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<char32_t>(c), os);
+  PrintTo(static_cast<char32_t>(c), os);
 }
 #endif
 

diff --git a/third_party/penumbra/vendor/CMakeLists.txt b/third_party/penumbra/vendor/CMakeLists.txt
@@ -38,6 +38,7 @@ add_library(tess2 ${libtess2_sources})
 
 target_include_directories(tess2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libtess2/Include)
 target_include_directories(tess2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libtess2/Source)
+target_compile_options(tess2 PRIVATE $<$<COMPILE_LANG_AND_ID:C,AppleClang>:-Wno-shorten-64-to-32>)
 
 if (NOT TARGET courierr)
   add_subdirectory(courierr)

diff --git a/third_party/re2/CMakeLists.txt b/third_party/re2/CMakeLists.txt
@@ -85,6 +85,7 @@ set(RE2_SOURCES
 
 add_library(re2 ${RE2_SOURCES})
 target_include_directories(re2 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+target_compile_options(re2 PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,AppleClang>:-Wno-shorten-64-to-32>)
 set_target_properties(re2 PROPERTIES SOVERSION ${SONAME} VERSION ${SONAME}.0.0)
 add_library(re2::re2 ALIAS re2)