Skip to content

G
glog
Commit ce8799c8 authored by Shinichiro Hamaji's avatar Shinichiro Hamaji Committed by GitHub
Browse files
Options

Merge pull request #209 from sergiud/cmake-icc-fix 

cmake: fixed gflags namespace detection (fixes #193)
parents 40fc2146 e50aeaa5
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmake/DetermineGflagsNamespace.cmake
View file @ ce8799c8
...@@ -35,7 +35,7 @@ int main(int argc, char**argv) ...@@ -35,7 +35,7 @@ int main(int argc, char**argv)
"${CMAKE_BINARY_DIR}" "${_check_file}" "${CMAKE_BINARY_DIR}" "${_check_file}"
COMPILE_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}" -DGFLAGS_NAMESPACE=${_namespace} COMPILE_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}" -DGFLAGS_NAMESPACE=${_namespace}
LINK_LIBRARIES "${gflags_LIBRARIES}" LINK_LIBRARIES "${gflags_LIBRARIES}"
CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING="${gflags_INCLUDE_DIR}" CMAKE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} "-DINCLUDE_DIRECTORIES:STRING=${gflags_INCLUDE_DIR}"
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
if (${VARIABLE}) if (${VARIABLE})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment