From 0c63c23c193af29112d2c89e3ca425249dc4b1eb Mon Sep 17 00:00:00 2001
From: Skef Iterum <github@skef.org>
Date: Mon, 7 Oct 2024 17:21:57 -0700
Subject: [PATCH] Try to work around more XCode stuff

---
 c/shared/CMakeLists.txt       | 50 ++++++++++++++++++-----------------
 cmake/ExternalAntlr4Cpp.cmake |  2 +-
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/c/shared/CMakeLists.txt b/c/shared/CMakeLists.txt
index 09463d11b..e67281b7a 100644
--- a/c/shared/CMakeLists.txt
+++ b/c/shared/CMakeLists.txt
@@ -125,30 +125,32 @@ set_property(TARGET shared PROPERTY CXX_STANDARD 17)
 
 target_include_directories(shared PRIVATE include resource)
 
-set_property(SOURCE absfont/absfont.cpp PROPERTY
-             COMPILE_DEFINITIONS $<$<CONFIG:Debug>:ABF_DEBUG=1>)
-set_property(SOURCE cfembed.cpp PROPERTY
-             COMPILE_DEFINITIONS $<$<CONFIG:Debug>:CEF_DEBUG=1>)
-set_property(SOURCE cffread_abs.cpp PROPERTY
-             COMPILE_DEFINITIONS $<$<CONFIG:Debug>:CFR_DEBUG=1>)
-set_property(SOURCE cffwrite/cffwrite.cpp PROPERTY
-             COMPILE_DEFINITIONS $<$<CONFIG:Debug>:CFW_DEBUG=1>)
-set_property(SOURCE dynarr.c PROPERTY
-             COMPILE_DEFINITIONS $<$<CONFIG:Debug>:DNA_DEBUG=1>)
-set_property(SOURCE pstoken.cpp PROPERTY
-             COMPILE_DEFINITIONS $<$<CONFIG:Debug>:PST_DEBUG=1>)
-set_property(SOURCE pdfwrite.cpp PROPERTY
-             COMPILE_DEFINITIONS $<$<CONFIG:Debug>:PDW_DEBUG=1>)
-set_property(SOURCE t1cstr.cpp PROPERTY
-             COMPILE_DEFINITIONS $<$<CONFIG:Debug>:T1C_DEBUG=1>)
-set_property(SOURCE t2cstr.cpp PROPERTY
-             COMPILE_DEFINITIONS $<$<CONFIG:Debug>:T1C_DEBUG=1>)
-set_property(SOURCE t1read.cpp PROPERTY
-             COMPILE_DEFINITIONS $<$<CONFIG:Debug>:T1R_DEBUG=1>)
-set_property(SOURCE t1write/t1write.c PROPERTY
-             COMPILE_DEFINITIONS $<$<CONFIG:Debug>:T1W_DEBUG=1>)
-set_property(SOURCE ttread.cpp PROPERTY
-             COMPILE_DEFINITIONS $<$<CONFIG:Debug>:TTR_DEBUG=1>)
+if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode.*")
+  set_property(SOURCE absfont/absfont.cpp PROPERTY
+               COMPILE_DEFINITIONS $<$<CONFIG:Debug>:ABF_DEBUG=1>)
+  set_property(SOURCE cfembed.cpp PROPERTY
+               COMPILE_DEFINITIONS $<$<CONFIG:Debug>:CEF_DEBUG=1>)
+  set_property(SOURCE cffread_abs.cpp PROPERTY
+               COMPILE_DEFINITIONS $<$<CONFIG:Debug>:CFR_DEBUG=1>)
+  set_property(SOURCE cffwrite/cffwrite.cpp PROPERTY
+               COMPILE_DEFINITIONS $<$<CONFIG:Debug>:CFW_DEBUG=1>)
+  set_property(SOURCE dynarr.c PROPERTY
+               COMPILE_DEFINITIONS $<$<CONFIG:Debug>:DNA_DEBUG=1>)
+  set_property(SOURCE pstoken.cpp PROPERTY
+               COMPILE_DEFINITIONS $<$<CONFIG:Debug>:PST_DEBUG=1>)
+  set_property(SOURCE pdfwrite.cpp PROPERTY
+               COMPILE_DEFINITIONS $<$<CONFIG:Debug>:PDW_DEBUG=1>)
+  set_property(SOURCE t1cstr.cpp PROPERTY
+               COMPILE_DEFINITIONS $<$<CONFIG:Debug>:T1C_DEBUG=1>)
+  set_property(SOURCE t2cstr.cpp PROPERTY
+               COMPILE_DEFINITIONS $<$<CONFIG:Debug>:T1C_DEBUG=1>)
+  set_property(SOURCE t1read.cpp PROPERTY
+               COMPILE_DEFINITIONS $<$<CONFIG:Debug>:T1R_DEBUG=1>)
+  set_property(SOURCE t1write/t1write.c PROPERTY
+               COMPILE_DEFINITIONS $<$<CONFIG:Debug>:T1W_DEBUG=1>)
+  set_property(SOURCE ttread.cpp PROPERTY
+               COMPILE_DEFINITIONS $<$<CONFIG:Debug>:TTR_DEBUG=1>)
+endif()
 
 if (${NEED_LIBXML2_DEPEND})
     add_dependencies(shared ${LIBXML2_TARGET})
diff --git a/cmake/ExternalAntlr4Cpp.cmake b/cmake/ExternalAntlr4Cpp.cmake
index c6751b1dd..f2cbdb1e4 100644
--- a/cmake/ExternalAntlr4Cpp.cmake
+++ b/cmake/ExternalAntlr4Cpp.cmake
@@ -16,7 +16,7 @@ if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*")
   # set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist/$(Configuration))
   set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist)
 elseif(${CMAKE_GENERATOR} MATCHES "Xcode.*")
-  set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist/$(CONFIGURATION))
+  set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist)
 else()
   set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist)
 endif()