[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1046-gc456ff0

[ljsebald <ljs...@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  c456ff0960fd19306241ecb8dab30148afb1f592 (commit)
       via  00bfacfb7b083e41cccabe553d695e516d94b716 (commit)
      from  44b00171ed98a48dce83a640af9eae66e5fe7454 (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 c456ff0960fd19306241ecb8dab30148afb1f592
Merge: 44b0017 00bfacf
Author: Lawrence Sebald <ljs...@us...>
Date:   Sat Sep 2 22:03:06 2023 -0400

    Merge pull request #286 from KallistiOS/kos_cmake
    
    Added KOS wrapper bash script for cmake

commit 00bfacfb7b083e41cccabe553d695e516d94b716
Author: Falco Girgis <gyr...@gm...>
Date:   Fri Sep 1 08:18:51 2023 -0500

    Added KOS wrapper bash script for cmake
    
    - Based on what the PSP SDK does, we simply automatically select the
      DC toolchain file for the user, using their KOS_BASE path
    - Needed to modify the message() output from dreamcast.toolchain.cmake
      to be VERBOSE level, because it was spamming regular configuration
    output

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

Summary of changes:
 utils/cmake/dreamcast.toolchain.cmake |  8 ++++----
 utils/gnu_wrappers/kos-cmake          | 13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100755 utils/gnu_wrappers/kos-cmake

diff --git a/utils/cmake/dreamcast.toolchain.cmake b/utils/cmake/dreamcast.toolchain.cmake
index c3dd71f..e4ee358 100644
--- a/utils/cmake/dreamcast.toolchain.cmake
+++ b/utils/cmake/dreamcast.toolchain.cmake
@@ -24,7 +24,7 @@ if(NOT DEFINED KOS_BASE)
         message(FATAL_ERROR "Variable KOS_BASE not set and was not found in the environment")
     endif()
     set(KOS_BASE $ENV{KOS_BASE})
-    message("KOS_BASE: ${KOS_BASE}")
+    message(VERBOSE "KOS_BASE: ${KOS_BASE}")
 endif()
 
 if(NOT DEFINED KOS_CC_BASE)
@@ -32,7 +32,7 @@ if(NOT DEFINED KOS_CC_BASE)
         message(FATAL_ERROR "Variable KOS_CC_BASE not set and was not found in the environment")
     endif()
     set(KOS_CC_BASE $ENV{KOS_CC_BASE})
-    message("KOS_CC_BASE: ${KOS_CC_BASE}")
+    message(VERBOSE "KOS_CC_BASE: ${KOS_CC_BASE}")
 endif()
 
 if(NOT DEFINED KOS_SUBARCH)
@@ -40,7 +40,7 @@ if(NOT DEFINED KOS_SUBARCH)
         message(FATAL_ERROR "Variable KOS_SUBARCH not set and was not found in the environment")
     endif()
     set(KOS_SUBARCH $ENV{KOS_SUBARCH})
-    message("KOS_SUBARCH: ${KOS_SUBARCH}")
+    message(VERBOSE "KOS_SUBARCH: ${KOS_SUBARCH}")
 endif()
 
 if(NOT DEFINED KOS_PORTS)
@@ -48,7 +48,7 @@ if(NOT DEFINED KOS_PORTS)
         message(FATAL_ERROR "Variable KOS_PORTS not set and was not found in the environment")
     endif()
     set(KOS_PORTS $ENV{KOS_PORTS})
-    message("KOS_PORTS: ${KOS_PORTS}")
+    message(VERBOSE "KOS_PORTS: ${KOS_PORTS}")
 endif()
 
 ##### Configure CMake System #####
diff --git a/utils/gnu_wrappers/kos-cmake b/utils/gnu_wrappers/kos-cmake
new file mode 100755
index 0000000..120174a
--- /dev/null
+++ b/utils/gnu_wrappers/kos-cmake
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+## Make sure KOS_BASE is set
+if [ -z "${KOS_BASE}" ]; then
+    echo "The KOS_BASE environment variable has not been set!"
+    echo "\tDid you source your environ.sh file?"
+    exit 1
+fi
+
+cmake \
+  -DCMAKE_TOOLCHAIN_FILE="${KOS_BASE}/utils/cmake/dreamcast.toolchain.cmake" \
+  "$@"
+


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