[C++] Generate codecs in a language specific directory.

Author: Niko-Klaiber

CMakeLists.txt

@@ -121,6 +121,7 @@ add_custom_target(sbe-jar
 )
 
 set(CODEC_TARGET_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
+set(CXX_CODEC_TARGET_DIR "${CODEC_TARGET_DIR}/cpp")
 set(CODEC_SCHEMA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sbe-tool/src/test/resources")
 set(CODEC_PERF_SCHEMA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sbe-benchmarks/src/main/resources")
 set(CODEC_EXAMPLES_SCHEMA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sbe-samples/src/main/resources")

sbe-benchmarks/src/main/cpp/CMakeLists.txt

@@ -29,8 +29,8 @@ endif ()
 set(SRCS_BENCHLET_MAIN benchlet-main.cpp)
 
 set(GENERATED_CODECS
-    ${CODEC_TARGET_DIR}/uk_co_real_logic_sbe_examples_car
-    ${CODEC_TARGET_DIR}/uk_co_real_logic_sbe_samples_fix
+    ${CXX_CODEC_TARGET_DIR}/uk_co_real_logic_sbe_examples_car
+    ${CXX_CODEC_TARGET_DIR}/uk_co_real_logic_sbe_samples_fix
 )
 
 set(SBE_CAR_SCHEMA ${CODEC_PERF_SCHEMA_DIR}/car.xml)
@@ -39,15 +39,15 @@ set(SBE_MD_SCHEMA ${CODEC_PERF_SCHEMA_DIR}/fix-message-samples.xml)
 add_custom_command(
     OUTPUT ${GENERATED_CODECS}
     DEPENDS ${SBE_CAR_SCHEMA} ${SBE_MD_SCHEMA} sbe-jar ${SBE_JAR}
-    COMMAND ${Java_JAVA_EXECUTABLE} -Dsbe.output.dir=${CODEC_TARGET_DIR} -Dsbe.target.language="cpp" -jar ${SBE_JAR} ${SBE_CAR_SCHEMA} ${SBE_MD_SCHEMA}
+    COMMAND ${Java_JAVA_EXECUTABLE} -Dsbe.output.dir=${CXX_CODEC_TARGET_DIR} -Dsbe.target.language="cpp" -jar ${SBE_JAR} ${SBE_CAR_SCHEMA} ${SBE_MD_SCHEMA}
 )
 add_custom_target(perf_codecs DEPENDS ${GENERATED_CODECS})
 
 add_executable(benchlet-sbe-car-runner ${SRCS_BENCHLET_MAIN} CarBench.cpp)
-target_include_directories(benchlet-sbe-car-runner PRIVATE ${CODEC_TARGET_DIR})
+target_include_directories(benchlet-sbe-car-runner PRIVATE ${CXX_CODEC_TARGET_DIR})
 target_link_libraries(benchlet-sbe-car-runner sbe)
 add_executable(benchlet-sbe-md-runner ${SRCS_BENCHLET_MAIN} MarketDataBench.cpp)
-target_include_directories(benchlet-sbe-md-runner PRIVATE ${CODEC_TARGET_DIR})
+target_include_directories(benchlet-sbe-md-runner PRIVATE ${CXX_CODEC_TARGET_DIR})
 target_link_libraries(benchlet-sbe-md-runner sbe)
 add_dependencies(benchlet-sbe-md-runner perf_codecs)
 add_dependencies(benchlet-sbe-car-runner perf_codecs)

sbe-samples/src/main/cpp/CMakeLists.txt

@@ -17,7 +17,7 @@
 find_package(Java REQUIRED)
 
 set(GENERATED_CODECS
-    ${CODEC_TARGET_DIR}/baseline
+    ${CXX_CODEC_TARGET_DIR}/baseline
 )
 
 set(EXAMPLES_SCHEMA ${CODEC_EXAMPLES_SCHEMA_DIR}/example-schema.xml)
@@ -26,15 +26,15 @@ add_custom_command(
     OUTPUT ${GENERATED_CODECS}
     WORKING_DIRECTORY ${CODEC_EXAMPLES_SCHEMA_DIR}
     DEPENDS ${EXAMPLES_SCHEMA} sbe-jar ${SBE_JAR}
-    COMMAND ${Java_JAVA_EXECUTABLE} -Dsbe.output.dir=${CODEC_TARGET_DIR} -Dsbe.generate.ir=true -Dsbe.target.language=cpp -Dsbe.xinclude.aware=true -jar ${SBE_JAR} ${EXAMPLES_SCHEMA}
+    COMMAND ${Java_JAVA_EXECUTABLE} -Dsbe.output.dir=${CXX_CODEC_TARGET_DIR} -Dsbe.generate.ir=true -Dsbe.target.language=cpp -Dsbe.xinclude.aware=true -jar ${SBE_JAR} ${EXAMPLES_SCHEMA}
 )
 add_custom_target(examples_codecs DEPENDS ${GENERATED_CODECS})
 
 add_executable(GeneratedStubExample GeneratedStubExample.cpp)
-target_include_directories(GeneratedStubExample PRIVATE ${CODEC_TARGET_DIR})
+target_include_directories(GeneratedStubExample PRIVATE ${CXX_CODEC_TARGET_DIR})
 target_link_libraries(GeneratedStubExample sbe)
 add_executable(OtfExample OtfExample.cpp)
-target_include_directories(OtfExample PRIVATE ${CODEC_TARGET_DIR})
+target_include_directories(OtfExample PRIVATE ${CXX_CODEC_TARGET_DIR})
 target_link_libraries(OtfExample sbe)
 
 add_dependencies(GeneratedStubExample examples_codecs)

sbe-tool/src/test/cpp/CMakeLists.txt

@@ -18,10 +18,10 @@ function(sbe_test name)
     add_executable("${name}" "${name}.cpp")
     target_include_directories("${name}"
         PRIVATE ${GTEST_SOURCE_DIR}/googletest/include
-        PRIVATE ${CODEC_TARGET_DIR}
+        PRIVATE ${CXX_CODEC_TARGET_DIR}
     )
     target_link_libraries("${name}" sbe ${GTEST_LIBS} ${CMAKE_THREAD_LIBS_INIT})
-    add_test(NAME ${name} COMMAND ${name} WORKING_DIRECTORY ${CODEC_TARGET_DIR})
+    add_test(NAME ${name} COMMAND ${name} WORKING_DIRECTORY ${CXX_CODEC_TARGET_DIR})
     add_dependencies(${name} gtest)
     if(${ARGC} GREATER 1)
         add_dependencies(${name} ${ARGV1})
@@ -37,15 +37,15 @@ set(GROUP_WITH_DATA_SCHEMA ${CODEC_SCHEMA_DIR}/group-with-data-schema.xml)
 set(COMPOSITE_ELEMENTS_SCHEMA ${CODEC_SCHEMA_DIR}/composite-elements-schema.xml)
 
 set(GENERATED_CODECS
-    ${CODEC_TARGET_DIR}
+    ${CXX_CODEC_TARGET_DIR}
 )
 
 add_custom_command(
     OUTPUT ${GENERATED_CODECS}
     DEPENDS ${CODE_GENERATION_SCHEMA} ${CODE_GENERATION_SCHEMA_CPP} ${COMPOSITE_OFFSETS_SCHEMA} ${MESSAGE_BLOCK_LENGTH_TEST}
             sbe-jar ${SBE_JAR}
     COMMAND ${Java_JAVA_EXECUTABLE}
-        -Dsbe.output.dir=${CODEC_TARGET_DIR} -Dsbe.generate.ir="true" -Dsbe.target.language="cpp" -jar ${SBE_JAR}
+        -Dsbe.output.dir=${CXX_CODEC_TARGET_DIR} -Dsbe.generate.ir="true" -Dsbe.target.language="cpp" -jar ${SBE_JAR}
         ${CODE_GENERATION_SCHEMA}
         ${COMPOSITE_OFFSETS_SCHEMA}
         ${MESSAGE_BLOCK_LENGTH_TEST}