Skip to content

CMake refactor #5

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
julionce merged 1 commit into from
Mar 10, 2020
Merged

CMake refactor #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 13 additions & 24 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.5)

project(rcutils)

option(RCUTILS_NO_THREAD_SUPPORT "Disable thread support." OFF)
option(RCUTILS_NO_FILESYSTEM "Disable filesystem usage." OFF)
option(RCUTILS_AVOID_DYNAMIC_ALLOCATION "Disable dynamic allocations." OFF)

# Default to C11
if(NOT CMAKE_C_STANDARD)
set(CMAKE_C_STANDARD 11)
Expand Down Expand Up @@ -29,27 +33,6 @@ else()
set(time_impl_c src/time_unix.c)
endif()

if(RCUTILS_NO_FILESYSTEM)
add_compile_options(-DRCUTILS_NO_FILESYSTEM=1)
endif()

if(RCUTILS_NO_THREAD_SUPPORT)
add_compile_options(-DRCUTILS_NO_THREAD_SUPPORT=1)
endif()

if(RCUTILS_AVOID_DYNAMIC_ALLOCATION)
add_compile_options(-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=1)
endif()

# target_compile_definitions(${PROJECT_NAME} PRIVATE "RCUTILS_NO_FILESYSTEM")
# target_compile_definitions(${PROJECT_NAME} PRIVATE "RCUTILS_NO_THREAD_SUPPORT")
# target_compile_definitions(${PROJECT_NAME} PRIVATE "RCUTILS_AVOID_DYNAMIC_ALLOCATION")

configure_file (
"${PROJECT_SOURCE_DIR}/include/rcutils/error_handling.h.in"
"${PROJECT_BINARY_DIR}/include/rcutils/error_handling.h"
)

set(rcutils_sources
src/allocator.c
src/array_list.c
Expand Down Expand Up @@ -111,8 +94,7 @@ add_custom_command(OUTPUT include/rcutils/logging_macros.h
VERBATIM
)
list(APPEND rcutils_sources
include/rcutils/logging_macros.h
include/rcutils/error_handling.h)
include/rcutils/logging_macros.h)
include_directories("${CMAKE_CURRENT_BINARY_DIR}/include")

add_library(
Expand All @@ -121,7 +103,14 @@ add_library(

# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
target_compile_definitions(${PROJECT_NAME} PRIVATE "RCUTILS_BUILDING_DLL")
target_compile_definitions(${PROJECT_NAME}
PRIVATE
RCUTILS_BUILDING_DLL
PUBLIC
$<$<BOOL:${RCUTILS_NO_THREAD_SUPPORT}>:RCUTILS_NO_THREAD_SUPPORT>
$<$<BOOL:${RCUTILS_NO_FILESYSTEM}>:RCUTILS_NO_FILESYSTEM>
$<$<BOOL:${RCUTILS_AVOID_DYNAMIC_ALLOCATION}>:RCUTILS_AVOID_DYNAMIC_ALLOCATION>
)

# Needed if pthread is used for thread local storage.
if(IOS AND IOS_SDK_VERSION LESS 10.0)
Expand Down
3 changes: 0 additions & 3 deletions include/rcutils/error_handling.h.in → include/rcutils/error_handling.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ extern "C"
#include "rcutils/types/rcutils_ret.h"
#include "rcutils/visibility_control.h"

#cmakedefine RCUTILS_NO_FILESYSTEM
#cmakedefine RCUTILS_AVOID_DYNAMIC_ALLOCATION

#if defined(__STDC_LIB_EXT1__) && !defined(RCUTILS_NO_FILESYSTEM)
// Limit the buffer size in the `fwrite` call to give an upper bound to buffer overrun in the case
// of non-null terminated `msg`.
Expand Down