From 97515341454f26fcd14e50d5980f5f0361307814 Mon Sep 17 00:00:00 2001 From: FlorianPalm Date: Mon, 12 Jan 2015 18:45:01 +0100 Subject: [PATCH] fixes to the patch --- CMakeLists.txt | 19 ++++++++----------- src/ua_util.h | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c785182..9e66da0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,19 +47,16 @@ set(lib_sources src/ua_types.c # compiler flags if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") -add_definitions(-std=c99 -pedantic -pipe -Wall -Wextra -Werror -Wformat - -Wno-unused-parameter -Wno-unused-function -Wno-unused-label -Wpointer-arith -Wreturn-type -Wsign-compare -Wmultichar - -Wshadow -Wcast-align -Wcast-qual -Wmissing-prototypes -Wstrict-prototypes # -Wconversion - -Winit-self -Wuninitialized -Wno-deprecated -Wformat-security -ffunction-sections -fdata-sections) +add_definitions(-std=c99 -fomit-frame-pointer -pipe -msoft-float -fno-builtin -DEMBED -fno-strict-aliasing) if(NOT "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") add_definitions(-Wformat-nonliteral) - set (CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--gc-sections") - set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections") + set (CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,-elf2flt -msoft-float") + set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-elf2flt -msoft-float") else() add_definitions(-Wno-gnu-statement-expression) endif() if(NOT WIN32) - add_definitions(-fstack-protector -fPIC -fvisibility=hidden) + # add_definitions(-fPIC) endif() endif() @@ -149,10 +149,7 @@ else() endif() add_library(open62541-objects OBJECT ${lib_sources}) -add_library(open62541 SHARED $) -add_library(open62541-static STATIC $) -SET_TARGET_PROPERTIES(open62541-static PROPERTIES OUTPUT_NAME open62541 CLEAN_DIRECT_OUTPUT 1) # static version that exports all symbols -target_compile_definitions(open62541-objects PUBLIC UA_DYNAMIC_LINKING) +add_library(open62541 $) ## logging set(UA_LOGLEVEL 400 CACHE STRING "Level at which logs shall be reported") -- 2.2.0