From d4b8b55c75d94e0c18c4ead538ee6860dcc9fe31 Mon Sep 17 00:00:00 2001
From: Chris McFarlen <cmcfarlen@apple.com>
Date: Mon, 18 Dec 2023 14:56:21 -0600
Subject: [PATCH 1/3] cmake: small fixes to install

---
 .gitignore               | 2 +-
 CMakeLists.txt           | 4 +++-
 cmake/post_install.cmake | 3 +--
 src/api/CMakeLists.txt   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5c26e9a34ff..8635f435006 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,7 @@ Makefile.in
 .cproject
 .idea
 
-CMakeUserPresets.json
+/CMakeUserPresets.json
 
 # clangd language server files.
 /compile_commands.json
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac0a9e1a2cf..93cc4f651de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -720,7 +720,9 @@ install(DIRECTORY DESTINATION ${CMAKE_INSTALL_CACHEDIR})
 
 install(CODE "set(OWNER_USER ${TS_PKGSYSUSER})")
 install(CODE "set(OWNER_GROUP ${TS_PKGSYSGROUP})")
-install(CODE "set(CHOWN_DIRS ${CMAKE_INSTALL_LOGDIR} ${CMAKE_INSTALL_RUNSTATEDIR} ${CMAKE_INSTALL_CACHEDIR})")
+install(
+  CODE "set(CHOWN_DIRS ${CMAKE_INSTALL_FULL_LOGDIR} ${CMAKE_INSTALL_FULL_RUNSTATEDIR} ${CMAKE_INSTALL_FULL_CACHEDIR})"
+)
 install(SCRIPT cmake/post_install.cmake)
 
 # Display build summary
diff --git a/cmake/post_install.cmake b/cmake/post_install.cmake
index 641e198bfbe..3fe43284f9c 100644
--- a/cmake/post_install.cmake
+++ b/cmake/post_install.cmake
@@ -17,8 +17,7 @@
 
 if("$ENV{USER}" STREQUAL root)
   foreach(DIR ${CHOWN_DIRS})
-    message(STATUS "Changing ${DIR} ownership to ${OWNER_USER}:${OWNER_GROUP}")
+    message(STATUS "Changing $ENV{DESTDIR}${DIR} ownership to ${OWNER_USER}:${OWNER_GROUP}")
     execute_process(COMMAND chown ${OWNER_USER}:${OWNER_GROUP} "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${DIR}")
   endforeach()
-
 endif()
diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
index f9b65b52df0..3f00e974f22 100644
--- a/src/api/CMakeLists.txt
+++ b/src/api/CMakeLists.txt
@@ -51,7 +51,7 @@ target_link_libraries(
 )
 
 install(
-  TARGETS tsapi tsapibackend
+  TARGETS tsapi
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ts

From 4e0231cff0ddf2d2691ce7729db09a3f2e8f16e8 Mon Sep 17 00:00:00 2001
From: Chris McFarlen <cmcfarlen@apple.com>
Date: Mon, 18 Dec 2023 15:29:11 -0600
Subject: [PATCH 2/3] fix post install command

---
 cmake/post_install.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/post_install.cmake b/cmake/post_install.cmake
index 3fe43284f9c..01e08a5fc47 100644
--- a/cmake/post_install.cmake
+++ b/cmake/post_install.cmake
@@ -18,6 +18,6 @@
 if("$ENV{USER}" STREQUAL root)
   foreach(DIR ${CHOWN_DIRS})
     message(STATUS "Changing $ENV{DESTDIR}${DIR} ownership to ${OWNER_USER}:${OWNER_GROUP}")
-    execute_process(COMMAND chown ${OWNER_USER}:${OWNER_GROUP} "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${DIR}")
+    execute_process(COMMAND chown ${OWNER_USER}:${OWNER_GROUP} "$ENV{DESTDIR}${DIR}")
   endforeach()
 endif()

From 7d08754503a799c9bb2a8377198136d86ec94981 Mon Sep 17 00:00:00 2001
From: Chris McFarlen <cmcfarlen@apple.com>
Date: Mon, 18 Dec 2023 17:09:28 -0600
Subject: [PATCH 3/3] Install yaml-cpp if the build uses the internal version

---
 lib/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 5ad291e7cc6..513fefccdd7 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -23,7 +23,7 @@ if(NOT TARGET yaml-cpp::yaml-cpp)
   # Turning CLANG_FORMAT off causes yamlcpp to not add its format target which
   # otherwise conflicts with our format target.
   set(YAML_CPP_CLANG_FORMAT_EXE OFF)
-  set(YAML_CPP_INSTALL OFF)
+  set(YAML_CPP_INSTALL ON)
   add_subdirectory(yamlcpp)
   install(TARGETS yaml-cpp)
 endif()