projects
/
platform
/
upstream
/
glog.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
5b1aa94
)
Merge pull request #283 from Mizux/master
author
Sergiu Deitsch
<sergiud@users.noreply.github.com>
Thu, 4 Jan 2018 13:38:21 +0000
(14:38 +0100)
committer
GitHub
<noreply@github.com>
Thu, 4 Jan 2018 13:38:21 +0000
(14:38 +0100)
Use target gflags instead of old VARIABLES
cmake/DetermineGflagsNamespace.cmake
patch
|
blob
|
history
diff --git
a/cmake/DetermineGflagsNamespace.cmake
b/cmake/DetermineGflagsNamespace.cmake
index
5f30267
..
25111a1
100755
(executable)
--- a/
cmake/DetermineGflagsNamespace.cmake
+++ b/
cmake/DetermineGflagsNamespace.cmake
@@
-34,8
+34,8
@@
int main(int argc, char**argv)
try_compile (${VARIABLE}
"${CMAKE_BINARY_DIR}" "${_check_file}"
COMPILE_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}" -DGFLAGS_NAMESPACE=${_namespace}
- LINK_LIBRARIES
"${gflags_LIBRARIES}"
- CMAKE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
"-DINCLUDE_DIRECTORIES:STRING=${gflags_INCLUDE_DIR}"
+ LINK_LIBRARIES
gflags
+ CMAKE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
OUTPUT_VARIABLE OUTPUT)
if (${VARIABLE})