-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/2.4' into 2.5
- Loading branch information
Showing
34 changed files
with
2,984 additions
and
1,426 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| cmake_minimum_required (VERSION 3.11) | ||
| project (kaitai_struct_cpp_stl_runtime CXX) | ||
| enable_testing() | ||
|
|
||
| option(BUILD_SHARED_LIBS "Build using shared libraries" ON) | ||
| option(BUILD_TESTS "Build tests" ON) | ||
|
|
||
| set (CMAKE_INCLUDE_CURRENT_DIR ON) | ||
|
|
||
| find_package(ZLIB) | ||
| find_package(Iconv) | ||
|
|
||
| set (HEADERS | ||
| kaitai/kaitaistream.h | ||
| kaitai/kaitaistruct.h | ||
| kaitai/exceptions.h | ||
| ) | ||
|
|
||
| set (SOURCES | ||
| kaitai/kaitaistream.cpp | ||
| ) | ||
|
|
||
| set(STRING_ENCODING_TYPE "ICONV" CACHE STRING "Set the way strings have to be encoded (ICONV|WIN32API|NONE|...)") | ||
|
|
||
| set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) | ||
|
|
||
| add_library (${PROJECT_NAME} ${HEADERS} ${SOURCES}) | ||
| set_property(TARGET ${PROJECT_NAME} PROPERTY PUBLIC_HEADER ${HEADERS}) | ||
| target_include_directories(${PROJECT_NAME} INTERFACE ${PROJECT_SOURCE_DIR}) | ||
|
|
||
| if (ZLIB_FOUND) | ||
| target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB) | ||
| target_compile_definitions(${PROJECT_NAME} PRIVATE -DKS_ZLIB) | ||
| endif() | ||
|
|
||
| if(Iconv_FOUND) | ||
| target_link_libraries(${PROJECT_NAME} PRIVATE Iconv::Iconv) | ||
| endif() | ||
|
|
||
| include(Common.cmake) | ||
|
|
||
| install(TARGETS ${PROJECT_NAME} | ||
| ARCHIVE DESTINATION lib | ||
| LIBRARY DESTINATION lib | ||
| RUNTIME DESTINATION bin | ||
| PUBLIC_HEADER DESTINATION include/kaitai | ||
| ) | ||
|
|
||
| # Add the tests | ||
| if(BUILD_TESTS) | ||
| add_subdirectory(tests) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| if (STRING_ENCODING_TYPE STREQUAL "ICONV") | ||
| target_compile_definitions(${PROJECT_NAME} PRIVATE -DKS_STR_ENCODING_ICONV) | ||
| elseif (STRING_ENCODING_TYPE STREQUAL "WIN32API") | ||
| target_compile_definitions(${PROJECT_NAME} PRIVATE -DKS_STR_ENCODING_WIN32API) | ||
| elseif (STRING_ENCODING_TYPE STREQUAL "NONE") | ||
| target_compile_definitions(${PROJECT_NAME} PRIVATE -DKS_STR_ENCODING_NONE) | ||
| else() | ||
| # User action requested | ||
| endif() | ||
|
|
||
| # Maximum warnings emission, treat all warnings as errors | ||
| # | ||
| # This method was taken from https://www.pragmaticlinux.com/2022/07/enable-compiler-warnings-with-cmake/ | ||
| target_compile_options(${PROJECT_NAME} PRIVATE | ||
| $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX> | ||
| $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror> | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,21 @@ | ||
| Copyright 2016-2019 Kaitai Project: MIT license | ||
| MIT License | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
| Copyright (c) 2016-2022 Kaitai Project | ||
|
|
||
| The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| SOFTWARE. |
File renamed without changes.
Oops, something went wrong.