CMLibCommonLibraryTarget.cmake

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

CMLibConfigHPPGenerate.cmake

@@ -4,10 +4,6 @@ function(cmlib_config_hpp_generate)
 
   get_property(PROJECT_VERSION_INT GLOBAL PROPERTY PROJECT_VERSION_INT)
   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
                  ${CMAKE_BINARY_DIR}/include/cmlib_config.hpp)
 endfunction()

hpp/cmlib_config.hpp.in

@@ -4,11 +4,7 @@
 #define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_STR "@PROJECT_VERSION@"
 #define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_INT @PROJECT_VERSION_INT@
 #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_LOWER "@CMAKE_PROJECT_NAME_LOWER@"
-#define PROJECT_NAME_UPPER "@CMAKE_PROJECT_NAME_UPPER@"
 #define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
 #define BUILD_DATE "@TODAY@"
 #cmakedefine PROFILE @PROFILE@