Skip to content

Commit 3e45a65

Browse files
committed
build: simplify version handling
The SOVERSION was the same as the VERSION parameter, just use the same parameter.
1 parent 70d2b33 commit 3e45a65

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

CMakeLists.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ if(POLICY CMP0092)
99
endif()
1010

1111
project(cmark-gfm)
12-
13-
set(PROJECT_VERSION_MAJOR 0)
14-
set(PROJECT_VERSION_MINOR 29)
15-
set(PROJECT_VERSION_PATCH 0)
16-
set(PROJECT_VERSION_GFM 13)
17-
set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM})
12+
# NOTE: we cannot simply version the project due to the use of an invalid
13+
# version (the infixed `.gfm.`).
14+
set(PROJECT_VERSION 0.29.0.gfm.13)
1815

1916
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
2017

extensions/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set_target_properties(libcmark-gfm-extensions PROPERTIES
1919
MACOSX_RPATH TRUE
2020
OUTPUT_NAME cmark-gfm-extensions
2121
PDB_NAME libcmark-gfm-extensions
22-
SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM}
22+
SOVERSION ${PROJECT_VERSION}
2323
VERSION ${PROJECT_VERSION})
2424

2525
list(APPEND CMARK_INSTALL libcmark-gfm-extensions)

src/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ include_directories(
44
${PROJECT_BINARY_DIR}/extensions
55
)
66

7+
set(PROJECT_VERSION_MAJOR 0)
8+
set(PROJECT_VERSION_MINOR 29)
9+
set(PROJECT_VERSION_PATCH 0)
10+
set(PROJECT_VERSION_GFM 13)
711
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmark-gfm_version.h.in
812
${CMAKE_CURRENT_BINARY_DIR}/cmark-gfm_version.h)
913

@@ -56,7 +60,7 @@ set_target_properties(libcmark-gfm PROPERTIES
5660
MACOSX_RPATH TRUE
5761
OUTPUT_NAME cmark-gfm
5862
PDB_NAME libcmark-gfm
59-
SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM}
63+
SOVERSION ${PROJECT_VERSION}
6064
VERSION ${PROJECT_VERSION})
6165

6266
list(APPEND CMARK_INSTALL libcmark-gfm)

0 commit comments

Comments
 (0)