Skip to content

Commit 72ce1e5

Browse files
committed
rename cmake project to libtommath
Instead of prepending multiple times 'lib', change the target-properties `OUTPUT_NAME` once. This also improves cpack package names to be more distro-style. Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
1 parent d31801f commit 72ce1e5

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

CMakeLists.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
cmake_minimum_required(VERSION 3.10)
88

9-
project(tommath
9+
project(libtommath
1010
VERSION 1.2.0
1111
DESCRIPTION "A free open source portable number theoretic multiple-precision integer (MPI) library written entirely in C."
1212
HOMEPAGE_URL "https://www.libtom.net/LibTomMath"
@@ -102,6 +102,7 @@ target_link_options(${PROJECT_NAME} BEFORE PRIVATE
102102
)
103103

104104
set_target_properties(${PROJECT_NAME} PROPERTIES
105+
OUTPUT_NAME tommath
105106
VERSION ${PROJECT_VERSION}
106107
SOVERSION ${PROJECT_VERSION_MAJOR}
107108
PUBLIC_HEADER tommath.h
@@ -148,12 +149,12 @@ if(BUILD_SHARED_LIBS)
148149
set(CMAKE_INSTALL_PKGCONFIGDIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "Folder where to install .pc files")
149150

150151
configure_file(
151-
${CMAKE_CURRENT_SOURCE_DIR}/lib${PROJECT_NAME}.pc.in
152-
${CMAKE_CURRENT_BINARY_DIR}/lib${PROJECT_NAME}.pc
152+
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in
153+
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
153154
@ONLY
154155
)
155156

156-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${PROJECT_NAME}.pc
157+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
157158
DESTINATION ${CMAKE_INSTALL_PKGCONFIGDIR}
158159
)
159160
endif()
@@ -231,7 +232,11 @@ endif()
231232
# general CPack config
232233
set(CPACK_PACKAGE_DIRECTORY ${CMAKE_BINARY_DIR}/packages/${DISTRO_PACK_PATH})
233234
message(STATUS "CPack: packages will be generated under ${CPACK_PACKAGE_DIRECTORY}")
234-
set(CPACK_PACKAGE_NAME "lib${PROJECT_NAME}")
235+
if(BUILD_SHARED_LIBS)
236+
set(CPACK_PACKAGE_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}")
237+
else()
238+
set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-devel")
239+
endif()
235240
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
236241
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LibTomMath")
237242
set(CPACK_PACKAGE_VENDOR "libtom projects")
@@ -246,10 +251,9 @@ set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
246251
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
247252
set(CPACK_DEBIAN_PACKAGE_RELEASE ${PACKAGE_RELEASE_VERSION})
248253
if(BUILD_SHARED_LIBS)
249-
set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}1")
250254
set(CPACK_DEBIAN_PACKAGE_SECTION "libs")
251255
else()
252-
set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}-dev")
256+
set(CPACK_DEBIAN_PACKAGE_NAME "${PROJECT_NAME}-dev")
253257
set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
254258
endif()
255259

demo/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ else()
1515
# Define an independent project and all the necessary stuff around
1616
project(${LTM_TEST}
1717
LANGUAGES C)
18-
set(LIBRARY_NAME tommath)
18+
set(LIBRARY_NAME libtommath)
1919
find_package(${LIBRARY_NAME})
2020
include(CTest)
2121
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)

0 commit comments

Comments
 (0)