Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
91dd3fb8
Commit
91dd3fb8
authored
Apr 07, 2016
by
Jan Möbius
Browse files
Merge branch 'Ignore_DSSTORE' into 'master'
Ignore .DS_Store files on mac See merge request
!74
parents
222b7e1d
7d96e9f9
Pipeline
#1098
passed with stage
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
cmake/ACGCommon.cmake
View file @
91dd3fb8
...
...
@@ -713,7 +713,7 @@ endmacro ()
macro
(
acg_get_files_in_dir ret dir
)
file
(
GLOB_RECURSE __files RELATIVE
"
${
dir
}
"
"
${
dir
}
/*"
)
foreach
(
_file
${
__files
}
)
if
(
NOT _file MATCHES
".*svn.*"
)
if
(
(
NOT _file MATCHES
".*svn.*"
)
AND
(
NOT _file MATCHES
".DS_Store"
)
)
list
(
APPEND
${
ret
}
"
${
_file
}
"
)
endif
()
endforeach
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment