Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
pinocchio
Commits
c8ff000c
Commit
c8ff000c
authored
Oct 08, 2015
by
Valenza Florian
Browse files
[cmake] fix ADD_TEST_CFLAGS and ADD_TARGET_CFLAGS_MACRO. flags are now correctly appended
parent
3b7a186c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/CMakeLists.txt
View file @
c8ff000c
...
...
@@ -35,8 +35,7 @@ MACRO(ADD_SOURCE_GROUP FILENAMES)
ENDMACRO
(
ADD_SOURCE_GROUP FILENAMES
)
MACRO
(
ADD_TARGET_CFLAGS target flag
)
GET_TARGET_PROPERTY
(
${
target
}
_CFLAGS
${
target
}
COMPILE_FLAGS
)
SET_PROPERTY
(
TARGET
${
target
}
PROPERTY COMPILE_FLAGS
"
${${
target
}
_CFLAGS
}
${
flag
}
"
)
SET_PROPERTY
(
TARGET
${
target
}
APPEND_STRING PROPERTY COMPILE_FLAGS
"
${
flag
}
"
)
ENDMACRO
(
ADD_TARGET_CFLAGS
)
# ----------------------------------------------------
...
...
unittest/CMakeLists.txt
View file @
c8ff000c
...
...
@@ -32,8 +32,7 @@ MACRO(ADD_UNIT_TEST NAME PKGS)
ENDMACRO
(
ADD_UNIT_TEST
)
MACRO
(
ADD_TEST_CFLAGS target flag
)
GET_TARGET_PROPERTY
(
${
target
}
_CFLAGS
${
target
}
COMPILE_FLAGS
)
SET_PROPERTY
(
TARGET
${
target
}
PROPERTY COMPILE_FLAGS
"
${${
target
}
_CFLAGS
}
${
flag
}
"
)
SET_PROPERTY
(
TARGET
${
target
}
APPEND_STRING PROPERTY COMPILE_FLAGS
"
${
flag
}
"
)
ENDMACRO
(
ADD_TEST_CFLAGS
)
# --- RULES -------------------------------------------------------------------
...
...
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