Skip to content

CMake Fixes & Modernizations #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 30, 2019
Merged

CMake Fixes & Modernizations #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee02378
[C++] Fix build byproducts for Google Test.
denizevrenci Jan 30, 2019
435d9ff
[C++] Pass C and C++ compilers to subprojects.
denizevrenci Jan 30, 2019
f5607f3
[C++] Use target_include_directories instead of global declaration.
denizevrenci Jan 16, 2019
cd76a3c
[C++] Use target include directories for the sbe library.
denizevrenci Jan 16, 2019
2802536
[C++] Make SBE an interface library.
denizevrenci Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ if(SBE_TESTS)
URL ${CMAKE_CURRENT_SOURCE_DIR}/cppbuild/googletest-release-1.8.0.zip
URL_MD5 adfafc8512ab65fd3cf7955ef0100ff5
PREFIX "${SBE_THIRDPARTY_BINARY_DIR}/gtest"
BUILD_BYPRODUCTS "${SBE_THIRDPARTY_BINARY_DIR}/gtest/src/gtest-build/googlemock/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX};${SBE_THIRDPARTY_BINARY_DIR}/gtest/src/gtest-build/googlemock/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}"
CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER};-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
BUILD_BYPRODUCTS "${SBE_THIRDPARTY_BINARY_DIR}/gtest/src/gtest-build/googlemock/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX};${SBE_THIRDPARTY_BINARY_DIR}/gtest/src/gtest-build/googlemock/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}"
INSTALL_COMMAND ""
LOG_CONFIGURE ON
LOG_BUILD ON
Expand Down Expand Up @@ -127,13 +128,6 @@ 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")

include_directories(
${GTEST_SOURCE_DIR}/googletest/include
${GTEST_SOURCE_DIR}/googlemock/include
${CMAKE_CURRENT_SOURCE_DIR}/sbe-tool/src/main/cpp
${CODEC_TARGET_DIR}
)

add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sbe-tool/src/main/cpp)

if(SBE_TESTS)
Expand Down
4 changes: 4 additions & 0 deletions sbe-benchmarks/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ add_custom_command(
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_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_link_libraries(benchlet-sbe-md-runner sbe)
add_dependencies(benchlet-sbe-md-runner perf_codecs)
add_dependencies(benchlet-sbe-car-runner perf_codecs)

Expand Down
3 changes: 3 additions & 0 deletions sbe-samples/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ add_custom_command(
add_custom_target(examples_codecs DEPENDS ${GENERATED_CODECS})

add_executable(GeneratedStubExample GeneratedStubExample.cpp)
target_include_directories(GeneratedStubExample PRIVATE ${CODEC_TARGET_DIR})
target_link_libraries(GeneratedStubExample sbe)
add_executable(OtfExample OtfExample.cpp)
target_include_directories(OtfExample PRIVATE ${CODEC_TARGET_DIR})
target_link_libraries(OtfExample sbe)

add_dependencies(GeneratedStubExample examples_codecs)
Expand Down
3 changes: 2 additions & 1 deletion sbe-tool/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ set(HEADERS
otf/OtfHeaderDecoder.h
)

add_library(sbe STATIC ${HEADERS} dummy.cpp)
add_library(sbe INTERFACE)
target_include_directories(sbe INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

add_dependencies(sbe ir_codecs)
23 changes: 0 additions & 23 deletions sbe-tool/src/main/cpp/dummy.cpp
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions sbe-tool/src/test/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@

function(sbe_test name)
add_executable("${name}" "${name}.cpp")
target_include_directories("${name}"
PRIVATE ${GTEST_SOURCE_DIR}/googletest/include
PRIVATE ${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_dependencies(${name} gtest)
Expand Down