Fix make/cmake and includes. #28
Open
+68
−57
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DDvO
requested changes
Aug 22, 2022
Comment on lines
-46
to
-47
| if(DEFINED ENV{NDEBUG}) | ||
| add_definitions(-DNDEBUG=1 -O2) |
There was a problem hiding this comment.
I think that regarding (N)DEBUG, CMakeLists.txt and Makefile should remain consistent. In Makefile it now reads
ifdef DEBUG
DEBUG_FLAGS ?= -g -O0
# Add this to get some additional runtime checks.
# Warning: it's incompatible with tools like Valgrind and you have to add it to the app using this lib too
# DEBUG_FLAGS += -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all
override DEBUG_FLAGS += -DNDEBUG=1
else
DEBUG_FLAGS ?= -g -O0 -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all # not every compiler(version) supports -Og
endif
| @@ -219,10 +223,10 @@ clean_uta: | |||
| $(OUT_DIR)/$(OUTLIB)* $(OUT_DIR)/util/$(OUTBIN) $(OUT_DIR)/util/icvutil.o | |||
|
|
|||
| clean: | |||
| $(MAKE) -C util clean | |||
There was a problem hiding this comment.
This is inconsistent - $(MAKE) util is still part of build_all,
but you moved $(MAKE) -C util clean from clean_all to clean.
| @@ -150,11 +152,13 @@ ifeq ($(COV_ENABLED), 1) | |||
| endif | |||
| $(MAKE) COMPILE_TYPE=$(COMPILE_TYPE) build_only | |||
|
|
|||
| util: | |||
| util: $(OUT_DIR)/$(OUTLIB) | |||
Comment on lines
+159
to
+161
| build_all: | ||
| $(MAKE) build | ||
| $(MAKE) util |
There was a problem hiding this comment.
What is the advantage of this change?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.