SKA-269: Updated consumed SIL Kit version to 4.0.36 (#23)

vectorgrp · Sep 26, 2023 · 700185e · 700185e
1 parent ad082de
commit 700185e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,5 +2,7 @@
 * text eol=lf
 #ensure CANoe configs don't get their line endings converted
 *.cfg -text
-#configure .vtuexe files as binary files
+#ensure vtuexe are treated as binary files
 *.vtuexe binary
+#ensure pngs are treated as binary files
+*.png binary
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 set(SILKIT_ADAPTERS_VCAN_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 
-set(SILKIT_VERSION "4.0.28" CACHE STRING "If no SIL Kit package is specified, this version will be downloaded")
+set(SILKIT_VERSION "4.0.36" CACHE STRING "If no SIL Kit package is specified, this version will be downloaded")
 set(SILKIT_FLAVOR "ubuntu-18.04-x86_64-gcc" CACHE STRING "If no SIL Kit package is specified, this package flavor will be downloaded")
 
 find_package(Threads REQUIRED)

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -11,7 +11,7 @@
             "cacheVariables": {                
                 "CMAKE_C_COMPILER": "gcc",
                 "CMAKE_CXX_COMPILER": "g++",
-                "SILKIT_VERSION": "4.0.28",
+                "SILKIT_VERSION": "4.0.36",
                 "SILKIT_FLAVOR": "ubuntu-18.04-x86_64-gcc"
             },
             "condition": {

diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ The adapters and demos are built using ``cmake``:
 
 **Note 1:** If you have installed a self-built version of SIL Kit, you can build the adapter against it by setting SILKIT_PACKAGE_DIR to the installation path, where the bin, include and lib directories are.
 
-**Note 2:** If you don't provide a specific path for SILKIT_PACKAGE_DIR, a SIL Kit release package (SilKit-4.0.28-ubuntu-18.04-x86_64-gcc) will be fetched from github.com and the adapter will be built against it.
+**Note 2:** If you don't provide a specific path for SILKIT_PACKAGE_DIR, a SIL Kit release package (the default version listed in CMakeLists.txt) will be fetched from github.com and the adapter will be built against it.
 
 The adapter executable will be available in ``build/bin`` (depending on the configured build directory).
 Additionally the ``SilKit`` shared object (e.g., ``libSilKitd.so``) is copied to that directory automatically.