Skip to content

Commit

Permalink
Strptime update (#1133)
Browse files Browse the repository at this point in the history
* prepare to update strptime

* update strptime to glibc 2.37, with modifications.

* add missing cmake file.

* quiet MSVC warnings with strptime

* quiet codacy complaints about strptime

third party code

* use _strnicmp on windows

* ensure strptime works with signed enums for windows.
  • Loading branch information
tsteven4 authored Jun 30, 2023
1 parent 0deb74c commit 7088c7e
Show file tree
Hide file tree
Showing 12 changed files with 2,681 additions and 1,012 deletions.
2 changes: 1 addition & 1 deletion .codacy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ exclude_paths:
- 'mac/libusb/**'
- 'reference/**'
- 'shapelib/**'
- 'strptime/**'
- 'zlib/**'
- coverity_model.cc
- strptime.[ch]
- jeeps/gpsproj.cc
- jeeps/gpsproj.h
- tools/qtci/README.md
Expand Down
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ set(SUPPORT
src/core/vector3d.cc
src/core/xmlstreamwriter.cc
src/core/xmltag.cc
strptime.c
units.cc
util.cc
util_crc.cc
Expand Down Expand Up @@ -238,7 +237,6 @@ set(HEADERS
session.h
shape.h
skytraq.h
strptime.h
subrip.h
text.h
unicsv.h
Expand Down Expand Up @@ -285,8 +283,6 @@ if(UNIX)
set(SOURCES ${SOURCES} gbser_posix.cc)
set(HEADERS ${HEADERS} gbser_posix.h)
target_compile_options(gpsbabel PRIVATE -Wall)
# disable warning from strptime.c, which we don't want to own or modify
set_source_files_properties(strptime.c PROPERTIES COMPILE_OPTIONS -Wno-unused-but-set-variable)
endif()

if(WIN32)
Expand Down Expand Up @@ -317,6 +313,7 @@ endif()
include(shapelib.cmake)
include(zlib.cmake)
include(libusb.cmake)
include(strptime.cmake)

set(GPSBABEL_EXTRA_LINK_LIBRARIES "" CACHE STRING "extra libraries to link with.")
list(APPEND LIBS ${GPSBABEL_EXTRA_LINK_LIBRARIES})
Expand Down
Loading

0 comments on commit 7088c7e

Please sign in to comment.