luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: renamed GFLAGS_NAMESPACE to GLOG_GFLAGS_NAMESPACE (#318)

Browse Source 
This eliminates a conflict between glog and gflags preprocessor definition of GFLAGS_NAMESPACE that can cause the gflags namespace detection to fail (fixes #317).
This commit is contained in:
loop0day 2018-06-01 21:00:59 +08:00 committed by Sergiu Deitsch
parent 2faa186e62
commit abce78806c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/DetermineGflagsNamespace.cmake
View File

@ -15,7 +15,7 @@ macro(determine_gflags_namespace VARIABLE)
int main(int argc, char**argv) int main(int argc, char**argv)
{ {
GFLAGS_NAMESPACE::ParseCommandLineFlags(&argc, &argv, true); GLOG_GFLAGS_NAMESPACE::ParseCommandLineFlags(&argc, &argv, true);
} }
") ")
if (NOT CMAKE_REQUIRED_QUIET) if (NOT CMAKE_REQUIRED_QUIET)
@ -33,7 +33,7 @@ int main(int argc, char**argv)
file (WRITE "${_check_file}" "${_check_code}") file (WRITE "${_check_file}" "${_check_code}")
try_compile (${VARIABLE} try_compile (${VARIABLE}
"${CMAKE_BINARY_DIR}" "${_check_file}" "${CMAKE_BINARY_DIR}" "${_check_file}"
COMPILE_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}" -DGFLAGS_NAMESPACE=${_namespace} COMPILE_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}" -DGLOG_GFLAGS_NAMESPACE=${_namespace}
LINK_LIBRARIES gflags LINK_LIBRARIES gflags
CMAKE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} CMAKE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)