niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unnecessary CMake modules and fixup os/CMakeLists.txt

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2018-12-20 16:26:15 +01:00
parent 1990007614
commit e25656a4c5
39 changed files with 406 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/util/CMakeLists.txt
View file

@ -18,8 +18,18 @@ PREPEND(srcs_util "${CMAKE_CURRENT_SOURCE_DIR}/src" ut_avl.c ut_crc.c ut_expand_
add_library(util ${srcs_util})
generate_export_header(util EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/exports/util/ut_export.h")
target_link_libraries(util PUBLIC OSAPI)
target_include_directories(util PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/exports/>"
"$<INSTALL_INTERFACE:${INSTALL_PREFIX}/include/>" "$<INSTALL_INTERFACE:${INSTALL_PREFIX}/exports/>")
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
# Shared libs will have this by default. Static libs need it too on x86_64.
set_property(TARGET util PROPERTY POSITION_INDEPENDENT_CODE TRUE)
endif()
target_include_directories(
util PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/exports/>"
"$<INSTALL_INTERFACE:${INSTALL_PREFIX}/include/>"
"$<INSTALL_INTERFACE:${INSTALL_PREFIX}/exports/>")
if(${CMAKE_C_COMPILER_ID} STREQUAL "SunPro")
add_definitions(-KPIC)

2
src/util/src/ut_xmlparser.c
View file

@ -281,6 +281,7 @@ static char *unescape_into_utf8 (char *dst, unsigned cp)
return dst;
}
OS_WARNING_MSVC_OFF(4996);
static int unescape_insitu (char *buffer, size_t *n)
{
const char *src = buffer;
@ -337,6 +338,7 @@ static int unescape_insitu (char *buffer, size_t *n)
*n = (size_t) (dst - buffer);
return 0;
}
OS_WARNING_MSVC_ON(4996);
static void discard_payload (struct ut_xmlpState *st)
{