Skip to content
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

Jump to bottom

Update top level CMakeLists.txt to be inline with Aeron #635

Merged
merged 9 commits into from Feb 1, 2019
Merged

Update top level CMakeLists.txt to be inline with Aeron #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
91ad0c1
[C++] Increment minimum required CMake version to 3.1.3.
denizevrenci Feb 1, 2019
9cd79d4
[C++] Set C++ standard using idiomatic approach.
denizevrenci Feb 1, 2019
9ff7cf9
[C++] Exceptions are enabled by default in C++ compilers.
denizevrenci Feb 1, 2019
6f4c423
[C++] Use idiomatic methods to set compile options.
denizevrenci Feb 1, 2019
1fdcd5a
[C++] Do not include debug symbols in Release builds.
denizevrenci Feb 1, 2019
810ab5e
[C++] Do not explicitly set O0 for Debug builds.
denizevrenci Feb 1, 2019
98d435a
[C++] Do not set non standard optimizations in Release builds.
denizevrenci Feb 1, 2019
a3e53eb
[C++] Explicitly list the IR codecs that should be generated.
denizevrenci Feb 1, 2019
b43742f
[C++] Remove redundant call to execute_process.
denizevrenci Feb 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 12 additions & 15 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -14,8 +14,8 @@
# limitations under the License.
#

cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
cmake_policy(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.1.3 FATAL_ERROR)
cmake_policy(VERSION 3.1.3)

file(STRINGS version.txt SBE_VERSION_TXT LIMIT_COUNT 1 REGEX "^[0-9]+(\\.[0-9]+)+")
string(REGEX REPLACE "^([0-9]+(\\.[0-9]+)+).*$" "\\1" SBE_VERSION_NUMERIC "${SBE_VERSION_TXT}")
Expand Down Expand Up @@ -44,6 +44,14 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build" FORCE)
endif(NOT CMAKE_BUILD_TYPE)

if(NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 11)
endif()

if(NOT DEFINED CMAKE_CXX_EXTENSIONS)
set(CMAKE_CXX_EXTENSIONS OFF)
endif()

if(SBE_TESTS)
set(SBE_THIRDPARTY_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty")

Expand Down Expand Up @@ -73,14 +81,12 @@ endif()
find_package(Threads)

if(UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fexceptions -g -Wall -Wpedantic -Wextra -Wno-unused-parameter")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast")
add_compile_options(-Wall -Wpedantic -Wextra -Wno-unused-parameter)
endif()

if(APPLE)
# -Wall doesn't enable everything we want to see
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare")
add_compile_options(-Wsign-compare)
add_definitions(-DDarwin)
elseif(MSVC)
add_definitions(-DWIN32)
Expand All @@ -98,15 +104,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/binaries")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")

set(SBE_JAR "${CMAKE_CURRENT_SOURCE_DIR}/sbe-all/build/libs/sbe-all-${SBE_VERSION_TXT}.jar")
if(EXISTS "${SBE_JAR}")
message("latest SBE jar found: ${SBE_JAR}")
else()
message("Generating SBE jar")
execute_process(
COMMAND ./gradlew build -x test -x check -x javadoc :sbe-all:build
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
endif()

file(GLOB_RECURSE SBE_SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/sbe-tool/src/main/java/*.java"
Expand Down
27 changes: 9 additions & 18 deletions sbe-tool/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -14,28 +14,19 @@
# limitations under the License.
#

file(GLOB_RECURSE CODECS
"uk_co_real_logic_sbe_ir_generated/*.h"
set(CODECS
uk_co_real_logic_sbe_ir_generated/ByteOrderCodec.h
uk_co_real_logic_sbe_ir_generated/FrameCodec.h
uk_co_real_logic_sbe_ir_generated/MessageHeader.h
uk_co_real_logic_sbe_ir_generated/PresenceCodec.h
uk_co_real_logic_sbe_ir_generated/PrimitiveTypeCodec.h
uk_co_real_logic_sbe_ir_generated/SignalCodec.h
uk_co_real_logic_sbe_ir_generated/TokenCodec.h
uk_co_real_logic_sbe_ir_generated/VarDataEncoding.h
)

find_package(Java REQUIRED)

if(NOT(CODECS))
execute_process(
COMMAND
${Java_JAVA_EXECUTABLE}
"-Dsbe.output.dir=${CMAKE_CURRENT_SOURCE_DIR}"
"-Dsbe.target.language=CPP"
"-jar" "${SBE_JAR}"
"../resources/sbe-ir.xml"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
)

file(GLOB_RECURSE CODECS
"uk_co_real_logic_sbe_ir_generated/*.h"
)
endif()

add_custom_command(OUTPUT ${CODECS}
COMMAND
${Java_JAVA_EXECUTABLE}
Expand Down