Skip to content

Makefiles: strip newlines in findiles and fix runChecks call #1784

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
rok-cesnovar merged 8 commits into from
Mar 22, 2020
Merged

Makefiles: strip newlines in findiles and fix runChecks call #1784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
77ec5b1
add strip
rok-cesnovar Mar 18, 2020
d6f9db9
different call to runChecks.py
rok-cesnovar Mar 18, 2020
f2901f5
use subst instead of strip
rok-cesnovar Mar 18, 2020
04b3bfe
add spaces for windows
rok-cesnovar Mar 19, 2020
a443194
ifneq -> ifeq
rok-cesnovar Mar 20, 2020
1924245
suffix space
rok-cesnovar Mar 20, 2020
c73c8d8
add spaces
rok-cesnovar Mar 21, 2020
abddcc0
remove os check
rok-cesnovar Mar 21, 2020
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
2 changes: 1 addition & 1 deletion make/compiler_flags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Find files subroutine for different operating system
# This is recursive version of the makefiles wildcard function
findfiles = $(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2)) $(wildcard $(d)/$(2)))
findfiles = $(subst \n,,$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2)) $(wildcard $(d)/$(2))))

ifneq ($(OS),Windows_NT)
GENERATE_DISTRIBUTION_TESTS=true
Expand Down
2 changes: 1 addition & 1 deletion makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ clean-all: clean clean-doxygen clean-deps clean-libraries

.PHONY: test-math-dependencies
test-math-dependencies:
@python runChecks.py
@./runChecks.py
##
# Debug target that allows you to print a variable
##
Expand Down