Skip to content

Commit ffe5718

Browse files
committed
Remove redundancy
1 parent df3b076 commit ffe5718

File tree

7 files changed

+6
-37
lines changed

7 files changed

+6
-37
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ set(SPARROW_IPC_HEADERS
101101
${SPARROW_IPC_INCLUDE_DIR}/sparrow_ipc/arrow_interface/arrow_schema.hpp
102102
${SPARROW_IPC_INCLUDE_DIR}/sparrow_ipc/arrow_interface/arrow_schema/private_data.hpp
103103
${SPARROW_IPC_INCLUDE_DIR}/sparrow_ipc/config/config.hpp
104-
${SPARROW_IPC_INCLUDE_DIR}/config/sparrow_ipc_version.hpp
104+
${SPARROW_IPC_INCLUDE_DIR}/sparrow_ipc/config/sparrow_ipc_version.hpp
105105
${SPARROW_IPC_INCLUDE_DIR}/sparrow_ipc/deserialize_variable_size_binary_array.hpp
106106
${SPARROW_IPC_INCLUDE_DIR}/sparrow_ipc/deserialize_fixedsizebinary_array.hpp
107107
${SPARROW_IPC_INCLUDE_DIR}/sparrow_ipc/deserialize_primitive_array.hpp

cmake/sparrow-ipcConfig.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# sparrow-ipc_FOUND - true if sparrow-ipc found on the system
55
# sparrow-ipc_INCLUDE_DIRS - the directory containing sparrow-ipc headers
6-
# sparrow-ipc_LIBRARY - empty
6+
# sparrow-ipc_LIBRARY - the location of the sparrow-ipc library (or empty if not applicable)
77

88
@PACKAGE_INIT@
99

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class SparrowIPCRecipe(ConanFile):
1818
topics = ("arrow", "apache arrow", "columnar format", "dataframe", "ipc", "serialization", "deserialization", "flatbuffers")
1919
package_type = "library"
2020
settings = "os", "arch", "compiler", "build_type"
21-
exports_sources = "include/*", "src/*", "cmake/*", "docs/*", "CMakeLists.txt", "sparrow-ipcConfig.cmake.in", "LICENSE"
21+
exports_sources = "include/*", "src/*", "cmake/*", "docs/*", "CMakeLists.txt", "LICENSE"
2222
options = {
2323
"shared": [True, False],
2424
"fPIC": [True, False],

include/config/sparrow_ipc_version.hpp

Lines changed: 0 additions & 14 deletions
This file was deleted.

include/sparrow_ipc/config/sparrow_ipc_version.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ namespace sparrow_ipc
99
constexpr int SPARROW_IPC_BINARY_CURRENT = 1;
1010
constexpr int SPARROW_IPC_BINARY_REVISION = 0;
1111
constexpr int SPARROW_IPC_BINARY_AGE = 0;
12+
13+
static_assert(SPARROW_IPC_BINARY_AGE <= SPARROW_IPC_BINARY_CURRENT, "SPARROW_IPC_BINARY_AGE cannot be greater than SPARROW_IPC_BINARY_CURRENT");
1214
}

sparrow-ipcConfig.cmake.in

Lines changed: 0 additions & 19 deletions
This file was deleted.

tests/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "doctest/doctest.h"
66

7-
#include "config/sparrow_ipc_version.hpp"
7+
#include "sparrow_ipc/config/sparrow_ipc_version.hpp"
88

99
TEST_CASE("versions exist and are readable")
1010
{

0 commit comments

Comments
 (0)