From 873e29592cf2c79986e358482fb5df67878c76b8 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 30 Mar 2020 23:02:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8=D0=BB=D1=8F=D1=86?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibCommonTargetProperties.cmake | 5 +++++ hpp/cmlib_config.hpp.in | 23 ----------------------- hpp/cmlib_private_config.hpp.in | 11 ----------- 3 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 hpp/cmlib_config.hpp.in diff --git a/CMLibCommonTargetProperties.cmake b/CMLibCommonTargetProperties.cmake index d6cba3d..40d5008 100644 --- a/CMLibCommonTargetProperties.cmake +++ b/CMLibCommonTargetProperties.cmake @@ -113,4 +113,9 @@ function(common_target_properties Name) ${__visibility} ANALYSIS) endif() + target_compile_definitions( + ${Name} + ${__visibility} + "TARGET_LSB_ID_${LSB_DISTRIBUTOR_ID}" + "TARGET_LSB_CODENAME_${LSB_CODENAME}") endfunction() diff --git a/hpp/cmlib_config.hpp.in b/hpp/cmlib_config.hpp.in deleted file mode 100644 index 9ab763d..0000000 --- a/hpp/cmlib_config.hpp.in +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef @CMLIB_PROJECT_NAME_CANONICAL@_CMLIB_CONFIG_HPP_ -#define @CMLIB_PROJECT_NAME_CANONICAL@_CMLIB_CONFIG_HPP_ - -#pragma once - -#define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_STR "@PROJECT_VERSION@" -#define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_INT @PROJECT_VERSION_INT@ -#define @CMLIB_PROJECT_NAME_CANONICAL@_BUILD_TYPE "@CMAKE_BUILD_TYPE@" -#define @CMLIB_PROJECT_NAME_CANONICAL@_BUILD_DATE "@TODAY@" - -#cmakedefine _LARGEFILE_SOURCE -#cmakedefine _LARGE_FILES -#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@ -#cmakedefine HAVE_FSEEKO -#cmakedefine HAVE__FSEEKI64 -#cmakedefine HAVE_LARGEFILES @HAVE_LARGEFILES@ - -#define TARGET_LSB_ID_@LSB_DISTRIBUTOR_ID@ -#define TARGET_LSB_CODENAME_@LSB_CODENAME@ -#define TARGET_LSB_RELEASE "@LSB_RELEASE@" - -#endif /* @CMLIB_PROJECT_NAME_CANONICAL@_CMLIB_CONFIG_HPP_ */ - diff --git a/hpp/cmlib_private_config.hpp.in b/hpp/cmlib_private_config.hpp.in index d8e2dab..b0a32a5 100644 --- a/hpp/cmlib_private_config.hpp.in +++ b/hpp/cmlib_private_config.hpp.in @@ -54,16 +54,5 @@ #define CMLIB_BUILD_DATE "@TODAY@" #endif -#cmakedefine _LARGEFILE_SOURCE -#cmakedefine _LARGE_FILES -#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@ -#cmakedefine HAVE_FSEEKO -#cmakedefine HAVE__FSEEKI64 -#cmakedefine HAVE_LARGEFILES @HAVE_LARGEFILES@ - -#define TARGET_LSB_ID_@LSB_DISTRIBUTOR_ID@ -#define TARGET_LSB_CODENAME_@LSB_CODENAME@ -#define TARGET_LSB_RELEASE "@LSB_RELEASE@" - #endif /* @CMLIB_PROJECT_NAME_CANONICAL@_CMLIB_CONFIG_HPP_ */