Skip to content

Commit 3cd4154

Browse files
committed
build: clean up the install rules
1 parent 7166989 commit 3cd4154

File tree

2 files changed

+39
-54
lines changed

2 files changed

+39
-54
lines changed

extensions/CMakeLists.txt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,15 @@ set_target_properties(libcmark-gfm-extensions PROPERTIES
2020
SOVERSION ${PROJECT_VERSION}
2121
VERSION ${PROJECT_VERSION})
2222

23-
list(APPEND CMARK_INSTALL libcmark-gfm-extensions)
2423

25-
26-
27-
install(TARGETS ${CMARK_INSTALL}
24+
install(TARGETS libcmark-gfm-extensions
2825
EXPORT cmark-gfm-extensions
2926
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
3027
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
31-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
32-
)
33-
28+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
3429
install(FILES
35-
${CMAKE_CURRENT_SOURCE_DIR}/include/cmark-gfm-core-extensions.h
36-
${CMAKE_CURRENT_SOURCE_DIR}/include/module.modulemap
30+
include/cmark-gfm-core-extensions.h
31+
include/module.modulemap
3732
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmark_gfm_extensions)
38-
3933
install(EXPORT cmark-gfm-extensions
4034
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake-gfm-extensions)

src/CMakeLists.txt

Lines changed: 35 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ set(PROJECT_VERSION_GFM 13)
55
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmark-gfm_version.h.in
66
${CMAKE_CURRENT_BINARY_DIR}/cmark-gfm_version.h)
77

8+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
9+
${CMAKE_CURRENT_BINARY_DIR}/config.h)
10+
11+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcmark-gfm.pc.in
12+
${CMAKE_CURRENT_BINARY_DIR}/libcmark-gfm.pc @ONLY)
13+
814
check_file_offset_bits()
915

1016
add_executable(cmark-gfm
@@ -57,55 +63,40 @@ set_target_properties(libcmark-gfm PROPERTIES
5763
SOVERSION ${PROJECT_VERSION}
5864
VERSION ${PROJECT_VERSION})
5965

60-
list(APPEND CMARK_INSTALL libcmark-gfm)
6166

62-
install(TARGETS cmark-gfm ${CMARK_INSTALL}
67+
install(TARGETS cmark-gfm libcmark-gfm
6368
EXPORT cmark-gfm
6469
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
6570
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
66-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
67-
)
68-
69-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcmark-gfm.pc.in
70-
${CMAKE_CURRENT_BINARY_DIR}/libcmark-gfm.pc @ONLY)
71+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
72+
install(FILES
73+
include/buffer.h
74+
include/chunk.h
75+
include/cmark_ctype.h
76+
include/cmark-gfm.h
77+
include/cmark-gfm_config.h
78+
include/cmark-gfm-extension_api.h
79+
include/cmark-gfm_version.h
80+
include/export.h
81+
include/footnotes.h
82+
include/houdini.h
83+
include/html.h
84+
include/inlines.h
85+
include/iterator.h
86+
include/map.h
87+
include/mutex.h
88+
include/node.h
89+
include/parser.h
90+
include/plugin.h
91+
include/references.h
92+
include/registry.h
93+
include/render.h
94+
include/scanners.h
95+
include/syntax_extension.h
96+
include/utf8.h
97+
include/module.modulemap
98+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmark_gfm)
7199
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcmark-gfm.pc
72100
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
73-
74-
install(FILES
75-
${CMAKE_CURRENT_SOURCE_DIR}/include/buffer.h
76-
${CMAKE_CURRENT_SOURCE_DIR}/include/chunk.h
77-
${CMAKE_CURRENT_SOURCE_DIR}/include/cmark_ctype.h
78-
${CMAKE_CURRENT_SOURCE_DIR}/include/cmark-gfm.h
79-
${CMAKE_CURRENT_SOURCE_DIR}/include/cmark-gfm_config.h
80-
${CMAKE_CURRENT_SOURCE_DIR}/include/cmark-gfm-extension_api.h
81-
${CMAKE_CURRENT_SOURCE_DIR}/include/cmark-gfm_version.h
82-
${CMAKE_CURRENT_SOURCE_DIR}/include/export.h
83-
${CMAKE_CURRENT_SOURCE_DIR}/include/footnotes.h
84-
${CMAKE_CURRENT_SOURCE_DIR}/include/houdini.h
85-
${CMAKE_CURRENT_SOURCE_DIR}/include/html.h
86-
${CMAKE_CURRENT_SOURCE_DIR}/include/inlines.h
87-
${CMAKE_CURRENT_SOURCE_DIR}/include/iterator.h
88-
${CMAKE_CURRENT_SOURCE_DIR}/include/map.h
89-
${CMAKE_CURRENT_SOURCE_DIR}/include/mutex.h
90-
${CMAKE_CURRENT_SOURCE_DIR}/include/node.h
91-
${CMAKE_CURRENT_SOURCE_DIR}/include/parser.h
92-
${CMAKE_CURRENT_SOURCE_DIR}/include/plugin.h
93-
${CMAKE_CURRENT_SOURCE_DIR}/include/references.h
94-
${CMAKE_CURRENT_SOURCE_DIR}/include/registry.h
95-
${CMAKE_CURRENT_SOURCE_DIR}/include/render.h
96-
${CMAKE_CURRENT_SOURCE_DIR}/include/scanners.h
97-
${CMAKE_CURRENT_SOURCE_DIR}/include/syntax_extension.h
98-
${CMAKE_CURRENT_SOURCE_DIR}/include/utf8.h
99-
${CMAKE_CURRENT_SOURCE_DIR}/include/module.modulemap
100-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmark_gfm
101-
)
102-
103101
install(EXPORT cmark-gfm
104102
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
105-
106-
export(TARGETS ${CMARK_INSTALL}
107-
FILE ${CMAKE_CURRENT_BINARY_DIR}/cmarkTargets.cmake)
108-
109-
CONFIGURE_FILE(
110-
${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
111-
${CMAKE_CURRENT_BINARY_DIR}/config.h)

0 commit comments

Comments
 (0)