1-
21###################################################################################
32#
43# Copyright (c) 2014, webvariants GmbH, http://www.webvariants.de
@@ -17,50 +16,60 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
1716project (bcrypt)
1817
1918enable_language (ASM)
20- set (MYLIB_VERSION_MAJOR 0)
21- set (MYLIB_VERSION_MINOR 1)
22- set (MYLIB_VERSION_PATCH 1)
19+
20+ set (MYLIB_VERSION_MAJOR 1)
21+ set (MYLIB_VERSION_MINOR 0)
22+ set (MYLIB_VERSION_PATCH 0)
2323set (MYLIB_VERSION_STRING ${MYLIB_VERSION_MAJOR} .${MYLIB_VERSION_MINOR} .${MYLIB_VERSION_PATCH} )
2424
2525set ( CMAKE_COLOR_MAKEFILE ON )
2626
27- set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} /lib)
28- set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} /lib)
29- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} /bin)
30-
3127set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall --std=c++11 -O3" )
3228set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3" )
3329
3430set ( CMAKE_ASM_FLAGS "${CXXFLAGS} -x assembler-with-cpp" )
3531
36- set ( SRCFILES ${CMAKE_CURRENT_SOURCE_DIR} /src/bcrypt.c
37- ${CMAKE_CURRENT_SOURCE_DIR} /src/crypt_blowfish.c
38- ${CMAKE_CURRENT_SOURCE_DIR} /src/crypt_gensalt.c
39- ${CMAKE_CURRENT_SOURCE_DIR} /src/wrapper.c
40- ${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
4138)
4239
4340include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} /include /bcrypt)
4441include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} /include )
4542
46- 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)
4755
4856add_executable ( ${PROJECT_NAME} _test ${CMAKE_CURRENT_SOURCE_DIR} /src/main.cpp)
57+
4958target_link_libraries ( ${PROJECT_NAME} _test ${PROJECT_NAME} )
5059
51- set_target_properties ( ${PROJECT_NAME} PROPERTIES VERSION ${MYLIB_VERSION_STRING} SOVERSION ${MYLIB_VERSION_MAJOR} )
60+ include (GNUInstallDirs )
5261
5362install (TARGETS ${PROJECT_NAME}
54- RUNTIME DESTINATION lib
55- LIBRARY DESTINATION lib)
56-
57- install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} /include / DESTINATION include )
63+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
64+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
5865
5966SET (CPACK_GENERATOR "DEB" )
6067SET (CPACK_SET_DESTDIR ON )
61- SET (CPACK_DEBIAN_PACKAGE_MAINTAINER "Tino Rusch" )
62- SET (CPACK_PACKAGE_VERSION "0.1.0" )
63- SET (CPACK_PACKAGE_VERSION_MAJOR "0" )
64- 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" )
6573SET (CPACK_PACKAGE_VERSION_PATCH "0" )
74+
6675INCLUDE (CPack)
0 commit comments