summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2021-11-25 09:39:52 +0300
committerIvan Maidanski <ivmai@mail.ru>2021-11-25 09:39:52 +0300
commit9f3f822984a3ec939de6dd0f4f632e486d451ad6 (patch)
treef980521ec68ad4ea37a96fe73fd28060efc24146 /CMakeLists.txt
parent99d4e2c2f80be53280c3992164d0e54c02e762c9 (diff)
downloadbdwgc-9f3f822984a3ec939de6dd0f4f632e486d451ad6.tar.gz
Move public header files to include/gc in source tree
Also, include/extra public header files (for the redirection) are moved to include directory. This is have the same directories structure of public headers in the source tree as that of the installed "include" directory. * doc/finalization.md: Remove "include/" prefix for cord.h. * LICENSE: Rename include/gc_allocator.h to gc/gc_allocator.h. * Makefile.direct (CORD_SRCS, CORD_INCLUDE_FILES): Add "gc/" prefix for cord.h, ec.h, cord_pos.h. * CMakeLists.txt [install_headers]: Likewise. * cord/cord.am (pkginclude_HEADERS): Likewise. * Makefile.direct (SRCS, tests/test.o, dyn_load.o, dyn_load_sunos53.o, mark.o, typd_mlc.o, finalize.o, ptr_chck.o, specific.o, alloc.o, pthread_support.o, thread_local_alloc.o, win32_threads.o): Add "gc/" prefix for gc_typed.h, gc_tiny_fl.h, gc_version.h, gc_inline.h, gc_mark.h, gc_disclaim.h, gc_allocator.h, javaxfc.h, gc_backptr.h, gc_gcj.h, leak_detector.h, gc_pthread_redirects.h, gc_config_macros.h. * NT_MAKEFILE (test.obj): Add gc\ prefix for gc_mark.h, gc_disclaim.h. * NT_MAKEFILE (cord\tests\de.obj, cord\tests\de_win.obj): Add gc\ prefix for cord.h, cord_pos.h. * OS2_MAKEFILE (cord\cordbscs.obj, cord\cordxtra.obj, cord\cordprnt.obj, cordtest.exe): Likewise. * cord/cordbscs.c: Add "gc/" prefix in include for cord.h, ec.h; reorder includes. * cord/cordprnt.c: Likewise. * cord/cordxtra.c: Likewise. * cord/tests/cordtest.c: Likewise. * cord/tests/de.c: Likewise. * cord/tests/de_win.c: Likewise. * extra/gc.c: Add "gc/" prefix in include for gc_inline.h, gc_pthread_redirects.h, javaxfc.h, gc_disclaim.h, gc_gcj.h, gc_backptr.h, gc_mark.h, gc_tiny_fl.h, leak_detector.h., gc_typed.h. * finalize.c: Likewise. * fnlz_mlc.c: Likewise. * gcj_mlc.c: Likewise. * include/private/dbg_mlc.h: Likewise. * include/private/gc_pmark.h: Likewise. * include/private/gc_priv.h: Likewise. * include/private/thread_local_alloc.h: Likewise. * malloc.c: Likewise. * mallocx.c: Likewise. * pthread_stop_world.c: Likewise. * pthread_support.c: Likewise. * reclaim.c: Likewise. * tests/disclaim_bench.c: Likewise. * tests/disclaim_test.c: Likewise. * tests/disclaim_weakmap_test.c: Likewise. * tests/leak_test.c: Likewise. * tests/staticrootstest.c: Likewise. * tests/test.c: Likewise. * tests/thread_leak_test.c: Likewise. * tests/trace_test.c: Likewise. * thread_local_alloc.c: Likewise. * typd_mlc.c: Likewise. * tests/test_cpp.cc: Add "gc/" prefix in include for gc_allocator.h. * include/extra/gc.h: Move to include folder; replace include<> to include "". * include/extra/gc_cpp.h: Likewise. * include/cord.h: Move to include/gc folder. * include/cord_pos.h: Likewise. * include/ec.h: Likewise. * include/gc.h: Likewise. * include/gc_allocator.h: Likewise. * include/gc_backptr.h: Likewise. * include/gc_config_macros.h: Likewise. * include/gc_cpp.h: Likewise. * include/gc_disclaim.h: Likewise. * include/gc_gcj.h: Likewise. * include/gc_inline.h: Likewise. * include/gc_mark.h: Likewise. * include/gc_pthread_redirects.h: Likewise. * include/gc_tiny_fl.h: Likewise. * include/gc_typed.h: Likewise. * include/gc_version.h: Likewise. * include/javaxfc.h: Likewise. * include/leak_detector.h: Likewise. * include/include.am (pkginclude_HEADERS): Add "gc/" prefix for gc.h, gc_backptr.h, gc_config_macros.h, gc_inline.h, gc_mark.h, gc_tiny_fl.h, gc_typed.h, gc_version.h, javaxfc.h, leak_detector.h, gc_disclaim.h, gc_gcj.h, gc_pthread_redirects.h, gc_allocator.h, gc_cpp.h. * CMakeLists.txt [install_headers]: Likewise. * include/include.am (include_HEADERS): Remove "extra/" prefix for gc_cpp.h, gc.h. * CMakeLists.txt [install_headers]: Likewise.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt41
1 files changed, 20 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 214ffbe9..495a1c7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -553,41 +553,40 @@ if (enable_cplusplus)
endif(enable_cplusplus)
if (install_headers)
- install(FILES include/gc.h
- include/gc_backptr.h
- include/gc_config_macros.h
- include/gc_inline.h
- include/gc_mark.h
- include/gc_tiny_fl.h
- include/gc_typed.h
- include/gc_version.h
- include/javaxfc.h
- include/leak_detector.h
+ install(FILES include/gc/gc.h
+ include/gc/gc_backptr.h
+ include/gc/gc_config_macros.h
+ include/gc/gc_inline.h
+ include/gc/gc_mark.h
+ include/gc/gc_tiny_fl.h
+ include/gc/gc_typed.h
+ include/gc/gc_version.h
+ include/gc/javaxfc.h
+ include/gc/leak_detector.h
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gc")
- install(FILES include/extra/gc.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+ install(FILES include/gc.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
if (enable_cplusplus)
- install(FILES include/gc_allocator.h
- include/gc_cpp.h
+ install(FILES include/gc_cpp.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+ install(FILES include/gc/gc_allocator.h
+ include/gc/gc_cpp.h
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gc")
- install(FILES include/extra/gc_cpp.h
- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
endif()
if (enable_disclaim)
- install(FILES include/gc_disclaim.h
+ install(FILES include/gc/gc_disclaim.h
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gc")
endif()
if (enable_gcj_support)
- install(FILES include/gc_gcj.h
+ install(FILES include/gc/gc_gcj.h
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gc")
endif()
if (enable_threads AND CMAKE_USE_PTHREADS_INIT)
- install(FILES include/gc_pthread_redirects.h
+ install(FILES include/gc/gc_pthread_redirects.h
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gc")
endif()
if (build_cord)
- install(FILES include/cord.h
- include/cord_pos.h
- include/ec.h
+ install(FILES include/gc/cord.h
+ include/gc/cord_pos.h
+ include/gc/ec.h
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gc")
endif()