[cadcdev-svn-commits] [SCM] branch master updated. 56c843d6eb9f48e8b90ed1d86f381508a3f00796

[kosmirror <kos...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  56c843d6eb9f48e8b90ed1d86f381508a3f00796 (commit)
       via  9a8fd7ae344366f5a7a3e8f316904a4ad53982e6 (commit)
       via  249068780cd97748249b97206eb8ed854a405da7 (commit)
      from  aa71e4bf968432dd95d8b1bc083e50d7fac9adda (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 56c843d6eb9f48e8b90ed1d86f381508a3f00796
Author: Falco Girgis <gyr...@gm...>
Date:   Thu May 22 11:53:17 2025 -0500

    CMAKE_INSTALL_BINDIR => DC_TOOLS_BASE.

commit 9a8fd7ae344366f5a7a3e8f316904a4ad53982e6
Author: Falco Girgis <gyr...@gm...>
Date:   Thu May 22 11:40:28 2025 -0500

    Addressed review feedback (kinda).

commit 249068780cd97748249b97206eb8ed854a405da7
Author: Falco Girgis <gyr...@gm...>
Date:   Wed May 21 19:06:42 2025 -0500

    Added CMake installation include and lib dirs.
    
    Modified dreamcast.toolchain.cmake to automatically configure CMake's
    two environment variables controlling where files get copied to when
    installing (CMAKE_INSTALL_INCLUDEDIR, CMAKE_INSTALL_LIBDIR) to
    automatically point to the proper locations within kos-ports.

-----------------------------------------------------------------------

Summary of changes:
 utils/cmake/dreamcast.toolchain.cmake | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/utils/cmake/dreamcast.toolchain.cmake b/utils/cmake/dreamcast.toolchain.cmake
index beb3696a..67f4f92e 100644
--- a/utils/cmake/dreamcast.toolchain.cmake
+++ b/utils/cmake/dreamcast.toolchain.cmake
@@ -1,6 +1,6 @@
 # CMake Toolchain file for targeting the Dreamcast or NAOMI with CMake.
 #  Copyright (C) 2023 Luke Benstead
-#  Copyright (C) 2023, 2024 Falco Girgis
+#  Copyright (C) 2023, 2024, 2025 Falco Girgis
 #  Copyright (C) 2024 Donald Haase
 #  Copyright (C) 2024 Paul Cercueil
 #
@@ -29,14 +29,19 @@ cmake_minimum_required(VERSION 3.13)
 #### Set Configuration Variables From Environment ####
 if(NOT DEFINED ENV{KOS_BASE}
    OR NOT DEFINED ENV{KOS_CC_BASE}
+   OR NOT DEFINED ENV{KOS_ARCH}
    OR NOT DEFINED ENV{KOS_SUBARCH}
-   OR NOT DEFINED ENV{KOS_PORTS})
+   OR NOT DEFINED ENV{KOS_PORTS}
+   OR NOT DEFINED ENV{DC_TOOLS_BASE})
     message(FATAL_ERROR "KallistiOS environment variables not found")
 else()
-    set(KOS_BASE $ENV{KOS_BASE})
-    set(KOS_CC_BASE $ENV{KOS_CC_BASE})
-    set(KOS_SUBARCH $ENV{KOS_SUBARCH})
-    set(KOS_PORTS $ENV{KOS_PORTS})
+    set(KOS_BASE      $ENV{KOS_BASE})
+    set(KOS_CC_BASE   $ENV{KOS_CC_BASE})
+    set(KOS_ARCH      $ENV{KOS_ARCH})
+    set(KOS_SUBARCH   $ENV{KOS_SUBARCH})
+    set(KOS_PORTS     $ENV{KOS_PORTS})
+    set(DC_TOOLS_BASE $ENV{DC_TOOLS_BASE})
+    set(KOS_ADDONS    ${KOS_BASE}/addons)
 endif()
 
 list(APPEND CMAKE_MODULE_PATH $ENV{KOS_BASE}/utils/cmake)
@@ -77,4 +82,9 @@ add_compile_options(
 set(CMAKE_ASM_FLAGS "")
 set(CMAKE_ASM_FLAGS_RELEASE "")
 
+# Default CMake installations to install to kos-addons
+set(CMAKE_INSTALL_BINDIR     ${DC_TOOLS_BASE})
+set(CMAKE_INSTALL_INCLUDEDIR ${KOS_ADDONS}/include/${KOS_ARCH})
+set(CMAKE_INSTALL_LIBDIR     ${KOS_ADDONS}/lib/${KOS_ARCH})
+
 include("${KOS_BASE}/utils/cmake/dreamcast.cmake")


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.