Merge remote-tracking branch 'origin/topic/timw/funsigned-char-build'

* origin/topic/timw/funsigned-char-build: Add /J flag on Windows to force unsigned char Pass -funsigned-char flag during compilation
zeek · Jul 2, 2023 · a4aadc5 · a4aadc5
2 parents e786f9d + bbd747d
commit a4aadc5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+1.8.0-9 | 2023-07-02 14:51:55 -0700
+
+  * Add /J flag on Windows to force unsigned char (Tim Wojtulewicz, Corelight)
+
+  * Pass -funsigned-char flag during compilation (Tim Wojtulewicz, Corelight)
+
 1.8.0-6 | 2023-06-22 11:02:37 -0700
 
   * Force -std=c++17 mode for cmake targets, remove use of RequireCXX17.cmake (Tim Wojtulewicz, Corelight)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,16 +9,17 @@ FindRequiredPackage(BISON)
 FindRequiredPackage(FLEX)
 
 if ( MISSING_PREREQS )
-    foreach (prereq ${MISSING_PREREQ_DESCS})
-        message(SEND_ERROR ${prereq})
-    endforeach ()
-    message(FATAL_ERROR "Configuration aborted due to missing prerequisites")
+  foreach (prereq ${MISSING_PREREQ_DESCS})
+    message(SEND_ERROR ${prereq})
+  endforeach ()
+  message(FATAL_ERROR "Configuration aborted due to missing prerequisites")
 endif ()
 
 if (MSVC)
-    set_property(SOURCE bif_lex.cc APPEND_STRING PROPERTY COMPILE_FLAGS "/wd4018")
+  add_compile_options(/J) # Similar to -funsigned-char on other platforms
+  set_property(SOURCE bif_lex.cc APPEND_STRING PROPERTY COMPILE_FLAGS "/wd4018")
 else()
-    set_property(SOURCE bif_lex.cc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-sign-compare")
+  set_property(SOURCE bif_lex.cc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-sign-compare")
 endif()
 
 include_directories(BEFORE

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.8.0-6
+1.8.0-9
diff --git a/cmake b/cmake
+18 −0		BuiltInSpicyAnalyzer.cmake
+8 −1		FindSpicy.cmake
+2 −2		SetDefaultCompileFlags.cmake
+5 −2		ZeekPlugin.cmake
+1 −1		zeek-plugin-create-package.sh