Skip to content

Commit 8a28445

Browse files
committed
build: inline useless variables
Repetition is preferred. This aids in discoverability when working with the build system.
1 parent a296ca4 commit 8a28445

File tree

2 files changed

+18
-23
lines changed

2 files changed

+18
-23
lines changed

extensions/CMakeLists.txt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
set(LIBRARY "libcmark-gfm-extensions")
2-
31
include_directories(include)
42

5-
add_library(${LIBRARY}
3+
add_library(libcmark-gfm-extensions
64
autolink.c
75
core-extensions.c
86
ext_scanners.c
@@ -12,23 +10,23 @@ add_library(${LIBRARY}
1210
table.c
1311
tagfilter.c
1412
tasklist.c)
15-
target_compile_definitions(${LIBRARY} PUBLIC
13+
target_compile_definitions(libcmark-gfm-extensions PUBLIC
1614
$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:CMARK_GFM_STATIC_DEFINE>)
1715

18-
set_target_properties(${LIBRARY} PROPERTIES
16+
set_target_properties(libcmark-gfm-extensions PROPERTIES
1917
OUTPUT_NAME "cmark-gfm-extensions"
2018
DEFINE_SYMBOL "libcmark_gfm_EXPORTS"
2119
SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM}
2220
VERSION ${PROJECT_VERSION})
2321

24-
set_property(TARGET ${LIBRARY}
22+
set_property(TARGET libcmark-gfm-extensions
2523
APPEND PROPERTY MACOSX_RPATH true)
2624

2725
# Avoid name clash between PROGRAM and LIBRARY pdb files.
28-
set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmark-gfm-extensions_dll)
26+
set_target_properties(libcmark-gfm-extensions PROPERTIES PDB_NAME cmark-gfm-extensions_dll)
2927

30-
list(APPEND CMARK_INSTALL ${LIBRARY})
31-
target_link_libraries(${LIBRARY} libcmark-gfm)
28+
list(APPEND CMARK_INSTALL libcmark-gfm-extensions)
29+
target_link_libraries(libcmark-gfm-extensions libcmark-gfm)
3230

3331

3432

src/CMakeLists.txt

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
set(LIBRARY "libcmark-gfm")
2-
set(PROGRAM "cmark-gfm")
3-
41
include_directories(include)
52
include_directories(
63
${PROJECT_SOURCE_DIR}/extensions/include
@@ -12,13 +9,13 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmark-gfm_version.h.in
129

1310
check_file_offset_bits()
1411

15-
add_executable(${PROGRAM}
12+
add_executable(cmark-gfm
1613
${PROJECT_SOURCE_DIR}/bin/main.c)
17-
target_link_libraries(${PROGRAM}
14+
target_link_libraries(cmark-gfm
1815
libcmark-gfm
1916
libcmark-gfm-extensions)
2017

21-
add_library(${LIBRARY}
18+
add_library(libcmark-gfm
2219
arena.c
2320
blocks.c
2421
buffer.c
@@ -47,30 +44,30 @@ add_library(${LIBRARY}
4744
syntax_extension.c
4845
utf8.c
4946
xml.c)
50-
target_compile_definitions(${LIBRARY} PUBLIC
47+
target_compile_definitions(libcmark-gfm PUBLIC
5148
$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:CMARK_GFM_STATIC_DEFINE>)
52-
target_include_directories(${LIBRARY} PUBLIC
49+
target_include_directories(libcmark-gfm PUBLIC
5350
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
5451
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/include>
5552
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extensions/include>)
56-
target_link_libraries(${LIBRARY} PRIVATE
53+
target_link_libraries(libcmark-gfm PRIVATE
5754
$<$<BOOL:${THREADS_FOUND}>:Threads::Threads>)
5855

5956
# Include minor version and patch level in soname for now.
60-
set_target_properties(${LIBRARY} PROPERTIES
57+
set_target_properties(libcmark-gfm PROPERTIES
6158
OUTPUT_NAME "cmark-gfm"
6259
SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM}
6360
VERSION ${PROJECT_VERSION})
6461

65-
set_property(TARGET ${LIBRARY}
62+
set_property(TARGET libcmark-gfm
6663
APPEND PROPERTY MACOSX_RPATH true)
6764

6865
# Avoid name clash between PROGRAM and LIBRARY pdb files.
69-
set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmark-gfm_dll)
66+
set_target_properties(libcmark-gfm PROPERTIES PDB_NAME cmark-gfm_dll)
7067

71-
list(APPEND CMARK_INSTALL ${LIBRARY})
68+
list(APPEND CMARK_INSTALL libcmark-gfm)
7269

73-
install(TARGETS ${PROGRAM} ${CMARK_INSTALL}
70+
install(TARGETS cmark-gfm ${CMARK_INSTALL}
7471
EXPORT cmark-gfm
7572
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
7673
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

0 commit comments

Comments
 (0)