]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: cmake: remove useless civetweb include path side effect.
authorMarcus Watts <mwatts@redhat.com>
Fri, 4 Nov 2016 03:33:44 +0000 (23:33 -0400)
committerMarcus Watts <mwatts@redhat.com>
Fri, 13 Jan 2017 02:54:25 +0000 (21:54 -0500)
For 'target_include_directories" for the cmake object library
'civetweb_common_objs', change from PUBLIC to PRIVATE.  This doesn't
break anything, so it wasn't doing anything useful.  If it has it
any effect, it would be to cause everything that linked against this
"library" to also use the indictated include path.  Which would be great
except everything in ceph wants to include "civetweb/civetweb.h" and
not "civetweb.h".  We already make separate arrangements elsewhere for
that to work.  Additionally, static object libraries in cmake aren't
really libraries, so I'm not entirely sure this even does anything.
So: making this public is not useful, and could be harmful.  Making it
private makes this only take effect for building civetweb.c itself,
exactly the effect we we require, and no more.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
(cherry picked from commit 8308a13b0257c9460fd2a721c20b0c37cb9e7c57)

src/CMakeLists.txt

index ca0319456a804a97692552b5abb03af9fad97b6f..f51ad8156837d9e6864b4a5685df36251246ef83 100644 (file)
@@ -1175,7 +1175,7 @@ if(${WITH_RADOSGW})
 
   set(civetweb_common_files civetweb/src/civetweb.c)
   add_library(civetweb_common_objs OBJECT ${civetweb_common_files})
-  target_include_directories(civetweb_common_objs PUBLIC
+  target_include_directories(civetweb_common_objs PRIVATE
        "${CMAKE_SOURCE_DIR}/src/civetweb/include")
   if(HAVE_OPENSSL)
   set_property(TARGET civetweb_common_objs