From: Fumitoshi Ukai Date: Wed, 19 Oct 2016 07:02:49 +0000 (+0900) Subject: Merge pull request #98 from willyd/relocatable X-Git-Tag: submit/tizen/20180313.064233~56 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f5cc8631a49cb33714a46845b66ffea5cf2c282b;p=platform%2Fupstream%2Fglog.git Merge pull request #98 from willyd/relocatable Added $ to gflags include directory --- f5cc8631a49cb33714a46845b66ffea5cf2c282b diff --cc CMakeLists.txt index f5078d6,d8a13bc..dc446b9 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -395,8 -385,12 +395,8 @@@ if (WIN32 AND HAVE_SNPRINTF HAVE_SNPRINTF) endif (WIN32 AND HAVE_SNPRINTF) -if (HAVE_NO_UNNAMED_TYPE_TEMPLATE_ARGS) - target_compile_options (glog PUBLIC -Wno-unnamed-type-template-args) -endif (HAVE_NO_UNNAMED_TYPE_TEMPLATE_ARGS) - if (gflags_FOUND) - target_include_directories (glog PUBLIC ${gflags_INCLUDE_DIR}) + target_include_directories (glog PUBLIC $) target_link_libraries (glog PUBLIC ${gflags_LIBRARIES}) if (NOT BUILD_SHARED_LIBS)