Skip to content

Commit 0be9688

Browse files
authored
Merge pull request trusch#2 from kriive/fix/soname
Rewrite CMakeLists.txt to make lintian happy
2 parents 8d25937 + 31ceb39 commit 0be9688

File tree

1 file changed

+34
-19
lines changed

1 file changed

+34
-19
lines changed

CMakeLists.txt

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
###################################################################################
32
#
43
# Copyright (c) 2014, webvariants GmbH, http://www.webvariants.de
@@ -18,43 +17,59 @@ project(bcrypt)
1817

1918
enable_language(ASM)
2019

21-
set( CMAKE_COLOR_MAKEFILE ON )
20+
set(MYLIB_VERSION_MAJOR 1)
21+
set(MYLIB_VERSION_MINOR 0)
22+
set(MYLIB_VERSION_PATCH 0)
23+
set(MYLIB_VERSION_STRING ${MYLIB_VERSION_MAJOR}.${MYLIB_VERSION_MINOR}.${MYLIB_VERSION_PATCH})
2224

23-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
24-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
25-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
25+
set( CMAKE_COLOR_MAKEFILE ON )
2626

2727
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall --std=c++11 -O3" )
2828
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3" )
2929

3030
set( CMAKE_ASM_FLAGS "${CXXFLAGS} -x assembler-with-cpp")
3131

32-
set( SRCFILES ${CMAKE_CURRENT_SOURCE_DIR}/src/bcrypt.c
33-
${CMAKE_CURRENT_SOURCE_DIR}/src/crypt_blowfish.c
34-
${CMAKE_CURRENT_SOURCE_DIR}/src/crypt_gensalt.c
35-
${CMAKE_CURRENT_SOURCE_DIR}/src/wrapper.c
36-
${CMAKE_CURRENT_SOURCE_DIR}/src/x86.S
32+
set( SRCFILES
33+
${CMAKE_CURRENT_SOURCE_DIR}/src/bcrypt.c
34+
${CMAKE_CURRENT_SOURCE_DIR}/src/crypt_blowfish.c
35+
${CMAKE_CURRENT_SOURCE_DIR}/src/crypt_gensalt.c
36+
${CMAKE_CURRENT_SOURCE_DIR}/src/wrapper.c
37+
${CMAKE_CURRENT_SOURCE_DIR}/src/x86.S
3738
)
3839

3940
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include/bcrypt)
4041
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include)
4142

42-
add_library( ${PROJECT_NAME} SHARED ${SRCFILES})
43+
add_library(
44+
${PROJECT_NAME}
45+
SHARED
46+
${SRCFILES}
47+
)
48+
49+
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${MYLIB_VERSION_STRING} SOVERSION ${MYLIB_VERSION_MAJOR})
50+
51+
set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER include/bcrypt/BCrypt.hpp)
52+
53+
target_include_directories(${PROJECT_NAME} PRIVATE include)
54+
target_include_directories(${PROJECT_NAME} PRIVATE src)
4355

4456
add_executable( ${PROJECT_NAME}_test ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp)
57+
4558
target_link_libraries( ${PROJECT_NAME}_test ${PROJECT_NAME})
4659

47-
install(TARGETS ${PROJECT_NAME}
48-
RUNTIME DESTINATION lib
49-
LIBRARY DESTINATION lib)
60+
include(GNUInstallDirs)
5061

51-
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)
62+
install(TARGETS ${PROJECT_NAME}
63+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
64+
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
5265

5366
SET(CPACK_GENERATOR "DEB")
5467
SET(CPACK_SET_DESTDIR ON)
55-
SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Tino Rusch")
56-
SET(CPACK_PACKAGE_VERSION "0.1.0")
57-
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
58-
SET(CPACK_PACKAGE_VERSION_MINOR "1")
68+
69+
SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Manuel Romei")
70+
SET(CPACK_PACKAGE_VERSION "1.0.0")
71+
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
72+
SET(CPACK_PACKAGE_VERSION_MINOR "0")
5973
SET(CPACK_PACKAGE_VERSION_PATCH "0")
74+
6075
INCLUDE(CPack)

0 commit comments

Comments
 (0)