From: Sergiu Deitsch Date: Thu, 4 Jan 2018 13:38:21 +0000 (+0100) Subject: Merge pull request #283 from Mizux/master X-Git-Tag: accepted/tizen/5.0/unified/20181102.024921~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb19c33b003fdd2648e791bcadcb29c9bf6d0c24;hp=5b1aa94e4b7cb47347b979e7dc8709370d8d6272;p=platform%2Fupstream%2Fglog.git Merge pull request #283 from Mizux/master Use target gflags instead of old VARIABLES --- diff --git a/cmake/DetermineGflagsNamespace.cmake b/cmake/DetermineGflagsNamespace.cmake index 5f30267..25111a1 100755 --- 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})