Commit 668bce9

authored

Add support for debugging with spdlog (#246)

Remove explicitly setting C++ flags variables in CMake and provide flags based on the value of environment variable DEBUG.

1 parent 9d27c79 commit 668bce9Copy full SHA for 668bce9

File tree

-8

lines changed

-8

lines changed

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,6 @@ else()`
`29`	`29`	`endif()`
`30`	`30`	`set(COMMON_COMPILE_FLAGS ${ARCH_SIZE} -Wall -Wextra -Werror)`
`31`	`31`
`32`		`-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -DDEBUG -UNDEBUG -UEDEBUG")`
`33`		`-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -DNDEBUG -DEDEBUG -UDEBUG")`
`34`		`-set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_PROFILE} -O2 -DNDEBUG -DEDEBUG -UDEBUG -DPERF")`
`35`		`-`
`36`	`32`	`if ("$ENV{MODE}" STREQUAL "SIMULATE")`
`37`	`33`	`add_compile_definitions(SIMULATE)`
`38`	`34`	`endif()`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,20 @@ add_library(enclave_trusted SHARED ${SOURCES})`
`25`	`25`	`if ("$ENV{MODE}" STREQUAL "SIMULATE")`
`26`	`26`	`target_compile_definitions(enclave_trusted PUBLIC -DSIMULATE)`
`27`	`27`	`endif()`
`28`		`-`
`29`	`28`	`if ("$ENV{DEBUG}" EQUAL 1)`
`30`		`- target_compile_options(enclave_trusted PUBLIC -g -O0)`
`31`		`- target_compile_definitions(enclave_trusted PUBLIC -DDEBUG)`
	`29`	`+ target_compile_definitions(enclave_trusted PRIVATE DEBUG)`
	`30`	`+ target_compile_options(enclave_trusted PRIVATE -g -O0)`
	`31`	`+else()`
	`32`	`+ target_compile_options(enclave_trusted PRIVATE -O3)`
`32`	`33`	`endif()`
`33`	`34`
`34`	`35`	`add_compile_options(${COMMON_COMPILE_FLAGS} -fvisibility=hidden -fpie -fstack-protector -Wno-unused-parameter -Wno-unused-variable -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles -Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined -Wl,-pie -Wl,--export-dynamic -Wl,--defsym,__ImageBase=0)`
	`36`	`+`
`35`	`37`	`target_compile_definitions(enclave_trusted PUBLIC OE_API_VERSION=2)`
`36`		`-set_target_properties(enclave_trusted PROPERTIES POSITION_INDEPENDENT_CODE OFF)`
	`38`	`+`
	`39`	`+set_target_properties(enclave_trusted`
	`40`	`+ PROPERTIES`
	`41`	`+ POSITION_INDEPENDENT_CODE OFF)`
`37`	`42`
`38`	`43`	`########## Fetch and make mc2-utils library available ##########`
`39`	`44`	`include(FetchContent)`

Comments

(0)