f1x1t/cmlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: f1x1t:6aa56df0113d831d986b27b785ed816cf715dba5
Branches Tags
f1x1t:master
...
compare: f1x1t:45d7f7054d8228fddc296033e09d698a01d9e0b2
Branches Tags
f1x1t:master

5 Commits
6aa56df011 ... 45d7f7054d

Author SHA1 Message Date
Andrey Astafyev
45d7f7054d Правка проверки наличия параметра 2019-10-04 14:07:44 +03:00
Andrey Astafyev
f095753fa6 Имя выходного файла для библиотеки 2019-10-04 14:02:07 +03:00
Andrey Astafyev
d28f78d521 Название проекта и организации в верхнем регистре 2019-10-04 12:35:35 +03:00
Andrey Astafyev
cceec65fe3 Merge branch 'master' of gitlab.2:/f1x1t/cmlib 2019-10-04 11:26:25 +03:00
Andrey Astafyev
6081722268 Название проекта и организации в нижнем регистре 2019-10-04 11:25:56 +03:00
3 changed files with 17 additions and 3 deletions
Show Stats Expand all files Collapse all files

12
CMLibCommonLibraryTarget.cmake
View File

@ -1,13 +1,19 @@
# Создание статической и динамической библиотеки из одинаковых объектных файлов # Создание статической и динамической библиотеки из одинаковых объектных файлов
function(add_common_library) function(add_common_library)
set(options) set(options)
set(oneValueArgs TARGET) set(oneValueArgs TARGET OUTPUT_NAME)
set(multiValueArgs SOURCES) set(multiValueArgs SOURCES)
cmake_parse_arguments(_LOCAL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) cmake_parse_arguments(_LOCAL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
set(LIBNAME ${_LOCAL_TARGET}) set(LIBNAME ${_LOCAL_TARGET})
set(SOURCES ${_LOCAL_SOURCES}) set(SOURCES ${_LOCAL_SOURCES})
if (_LOCAL_OUTPUT_NAME)
set(OUTNAME ${_LOCAL_OUTPUT_NAME})
else()
set(OUTNAME ${LIBNAME})
endif()
add_library(${LIBNAME} OBJECT ${SOURCES}) add_library(${LIBNAME} OBJECT ${SOURCES})
target_include_directories( target_include_directories(
${LIBNAME} ${LIBNAME}
@ -22,7 +28,7 @@ function(add_common_library)
PROPERTIES PROPERTIES
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR} SOVERSION ${PROJECT_VERSION_MAJOR}
OUTPUT_NAME ${LIBNAME} OUTPUT_NAME ${OUTNAME}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}) LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
install(TARGETS ${LIBNAME}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS ${LIBNAME}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif() endif()
@ -31,7 +37,7 @@ function(add_common_library)
add_library(${LIBNAME}_static STATIC $<TARGET_OBJECTS:${LIBNAME}>) add_library(${LIBNAME}_static STATIC $<TARGET_OBJECTS:${LIBNAME}>)
set_target_properties(${LIBNAME}_static set_target_properties(${LIBNAME}_static
PROPERTIES PROPERTIES
OUTPUT_NAME ${LIBNAME} OUTPUT_NAME ${OUTNAME}
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}) ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
install(TARGETS ${LIBNAME}_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS ${LIBNAME}_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif() endif()

4
CMLibConfigHPPGenerate.cmake
View File

@ -4,6 +4,10 @@ function(cmlib_config_hpp_generate)
get_property(PROJECT_VERSION_INT GLOBAL PROPERTY PROJECT_VERSION_INT) get_property(PROJECT_VERSION_INT GLOBAL PROPERTY PROJECT_VERSION_INT)
get_property(ORGANIZATION_NAME GLOBAL PROPERTY ORGANIZATION_NAME) get_property(ORGANIZATION_NAME GLOBAL PROPERTY ORGANIZATION_NAME)
string(TOLOWER ${ORGANIZATION_NAME} ORGANIZATION_NAME_LOWER)
string(TOUPPER ${ORGANIZATION_NAME} ORGANIZATION_NAME_UPPER)
string(TOLOWER ${CMAKE_PROJECT_NAME} CMAKE_PROJECT_NAME_LOWER)
string(TOUPPER ${CMAKE_PROJECT_NAME} CMAKE_PROJECT_NAME_UPPER)
configure_file(${CMLIB_MODULE_DIR}/hpp/cmlib_config.hpp.in configure_file(${CMLIB_MODULE_DIR}/hpp/cmlib_config.hpp.in
${CMAKE_BINARY_DIR}/include/cmlib_config.hpp) ${CMAKE_BINARY_DIR}/include/cmlib_config.hpp)
endfunction() endfunction()

4
hpp/cmlib_config.hpp.in
View File

@ -4,7 +4,11 @@
#define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_STR "@PROJECT_VERSION@" #define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_STR "@PROJECT_VERSION@"
#define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_INT @PROJECT_VERSION_INT@ #define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_INT @PROJECT_VERSION_INT@
#define ORGANIZATION_NAME "@ORGANIZATION_NAME@" #define ORGANIZATION_NAME "@ORGANIZATION_NAME@"
#define ORGANIZATION_NAME_LOWER "@ORGANIZATION_NAME_LOWER@"
#define ORGANIZATION_NAME_UPPER "@ORGANIZATION_NAME_UPPER@"
#define PROJECT_NAME "@CMAKE_PROJECT_NAME@" #define PROJECT_NAME "@CMAKE_PROJECT_NAME@"
#define PROJECT_NAME_LOWER "@CMAKE_PROJECT_NAME_LOWER@"
#define PROJECT_NAME_UPPER "@CMAKE_PROJECT_NAME_UPPER@"
#define BUILD_TYPE "@CMAKE_BUILD_TYPE@" #define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
#define BUILD_DATE "@TODAY@" #define BUILD_DATE "@TODAY@"
#cmakedefine PROFILE @PROFILE@ #cmakedefine PROFILE @PROFILE@