about summary refs log tree commit diff
path: root/absl/base
diff options
context:
space:
mode:
authorAdrien Devresse <adrien.devresse@epfl.ch>2017-10-31T21·15+0100
committerAdrien Devresse <adrien.devresse@epfl.ch>2017-11-02T17·47+0100
commita3322e3bfc96f33d3e195fd38a7c09f263e7e75f (patch)
treee219a8db3dbe4ebba5c8189888e2df12e4db1329 /absl/base
parent200b5a7cb0fb256ab47c933b3150aed91d9d3470 (diff)
Continue CMake support improvement
- Update documentation
- Remove type target
- Remove typos
- simplify target
- improve 1-1 matchign with Bazel targets
Diffstat (limited to 'absl/base')
-rw-r--r--absl/base/CMakeLists.txt49
1 files changed, 47 insertions, 2 deletions
diff --git a/absl/base/CMakeLists.txt b/absl/base/CMakeLists.txt
index 06f09d8f9ac5..3e94d51fef8e 100644
--- a/absl/base/CMakeLists.txt
+++ b/absl/base/CMakeLists.txt
@@ -65,10 +65,8 @@ list(APPEND BASE_SRC
   "internal/sysinfo.cc"
   "internal/thread_identity.cc"
   "internal/unscaledcycleclock.cc"
-  "internal/spinlock_wait.cc"
   "internal/low_level_alloc.cc"
   "internal/malloc_hook.cc"
-  "dynamic_annotations.cc"
   ${BASE_PUBLIC_HEADERS}
   ${BASE_INTERNAL_HEADERS}
 )
@@ -78,6 +76,9 @@ absl_library(
     absl_base
   SOURCES
     ${BASE_SRC}
+  PUBLIC_LIBRARIES
+    absl_dynamic_annotations
+    absl_spinlock_wait
   EXPORT_NAME
     base
 )
@@ -93,6 +94,8 @@ absl_library(
     ${MALLOC_EXTENSION_SRC}
   PUBLIC_LIBRARIES
     ${MALLOC_EXTENSION_PUBLIC_LIBRARIES}
+  EXPORT_NAME
+    malloc_extension
 )
 
 # throw delegate library
@@ -107,9 +110,51 @@ absl_library(
     ${THROW_DELEGATE_PUBLIC_LIBRARIES}
   PRIVATE_COMPILE_FLAGS
     ${ABSL_EXCEPTIONS_FLAG}
+  EXPORT_NAME
+    throw_delegate
 )
 
 
+# dynamic_annotations library
+set(DYNAMIC_ANNOTATIONS_SRC "dynamic_annotations.cc")
+
+absl_library(
+  TARGET
+    absl_dynamic_annotations
+  SOURCES
+    ${DYNAMIC_ANNOTATIONS_SRC}
+)
+
+
+# spinlock_wait library
+set(SPINLOCK_WAIT_SRC "internal/spinlock_wait.cc")
+
+absl_library(
+  TARGET
+    absl_spinlock_wait
+  SOURCES
+    ${SPINLOCK_WAIT_SRC}
+)
+
+
+# malloc_internal library
+list(APPEND MALLOC_INTERNAL_SRC
+  "internal/low_level_alloc.cc"
+  "internal/malloc_hook.cc"
+  "internal/malloc_hook_mmap_linux.inc"
+)
+
+absl_library(
+  TARGET
+    absl_malloc_internal
+  SOURCES
+    ${MALLOC_INTERNAL_SRC}
+  PUBLIC_LIBRARIES
+    absl_dynamic_annotations
+)
+
+
+
 #
 ## TESTS
 #