Skip to content

Commit

Permalink
Re-organize subdirectory includes based on compiler/runtime (#732)
Browse files Browse the repository at this point in the history
Signed-off-by: Juan Cruz Viotti <[email protected]>
  • Loading branch information
jviotti authored Feb 9, 2024
1 parent 868c742 commit e189a12
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 17 deletions.
47 changes: 30 additions & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,23 @@ option(JSONBINPACK_DOCS "Build the JSON BinPack documentation" OFF)
# Dependencies
find_package(JSONToolkit REQUIRED)

# Sources
add_subdirectory(src/numeric)
add_subdirectory(src/encoding)
add_subdirectory(src/encoder)
add_subdirectory(src/decoder)
add_subdirectory(src/parser)
add_subdirectory(src/schemas)
add_subdirectory(src/canonicalizer)
add_subdirectory(src/mapper)
# Runtime
if(JSONBINPACK_RUNTIME OR JSONBINPACK_CLI OR JSONBINPACK_COMPILER)
add_subdirectory(src/numeric)
add_subdirectory(src/encoding)
add_subdirectory(src/encoder)
add_subdirectory(src/decoder)
endif()

# Compiler
if(JSONBINPACK_COMPILER OR JSONBINPACK_CLI)
add_subdirectory(src/parser)
add_subdirectory(src/schemas)
add_subdirectory(src/canonicalizer)
add_subdirectory(src/mapper)
endif()

# CLI
if(JSONBINPACK_CLI)
add_subdirectory(src/cli)
endif()
Expand All @@ -58,14 +66,19 @@ if(JSONBINPACK_TESTS)
find_package(GoogleTest REQUIRED)
enable_testing()

add_subdirectory(test/numeric)
add_subdirectory(test/encoding)
add_subdirectory(test/encoder)
add_subdirectory(test/decoder)
add_subdirectory(test/parser)
add_subdirectory(test/schemas)
add_subdirectory(test/canonicalizer)
add_subdirectory(test/mapper)
if(JSONBINPACK_RUNTIME OR JSONBINPACK_CLI OR JSONBINPACK_COMPILER)
add_subdirectory(test/numeric)
add_subdirectory(test/encoding)
add_subdirectory(test/encoder)
add_subdirectory(test/decoder)
endif()

if(JSONBINPACK_COMPILER OR JSONBINPACK_CLI)
add_subdirectory(test/parser)
add_subdirectory(test/schemas)
add_subdirectory(test/canonicalizer)
add_subdirectory(test/mapper)
endif()

if(JSONBINPACK_CLI)
add_subdirectory(test/cli)
Expand Down
3 changes: 3 additions & 0 deletions src/encoding/include/sourcemeta/jsonbinpack/encoding_wrap.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#ifndef SOURCEMETA_JSONBINPACK_ENCODING_WRAP_H_
#define SOURCEMETA_JSONBINPACK_ENCODING_WRAP_H_

// TODO: Do not compile this file as part of the runtime. It logically belongs
// to the compiler

#include <sourcemeta/jsonbinpack/encoding.h>

#include <algorithm> // std::transform
Expand Down

0 comments on commit e189a12

Please sign in to comment.