]> git.apps.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>
Tue, 20 Dec 2016 05:36:34 +0000 (00:36 -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>
src/CMakeLists.txt

index 93963cf8bee478fac992f35c3bbe9adf085f6dda..256b061904a07424c0fab39d0256ce4da90ed864 100644 (file)
@@ -905,7 +905,7 @@ endif(WITH_KVS)
 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")
   set_property(TARGET civetweb_common_objs
     APPEND PROPERTY COMPILE_DEFINITIONS USE_IPV6=1)