From a8cf834b0c4b19a66165db9f1b6c027f23a2ab35 Mon Sep 17 00:00:00 2001 From: Vicente Eduardo Ferrer Garcia Date: Thu, 9 Dec 2021 17:55:43 +0200 Subject: [PATCH] Trying to solve bugs in msvc related to version library. --- source/threading/source/threading.c | 2 +- source/version/CMakeLists.txt | 10 +++---- source/version/include/version/version.h | 36 ++++++++++++++++++++++++ source/version/source/version.c | 4 ++- 4 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 source/version/include/version/version.h diff --git a/source/threading/source/threading.c b/source/threading/source/threading.c index 1aa0e90fe..101ece1bf 100644 --- a/source/threading/source/threading.c +++ b/source/threading/source/threading.c @@ -25,7 +25,7 @@ const char *threading_print_info() { static const char threading_info[] = - "Abstract Data Type Library " METACALL_VERSION "\n" + "Threading Library " METACALL_VERSION "\n" "Copyright (C) 2016 - 2021 Vicente Eduardo Ferrer Garcia \n" #ifdef ADT_STATIC_DEFINE diff --git a/source/version/CMakeLists.txt b/source/version/CMakeLists.txt index 9486e5134..bdac6dc34 100644 --- a/source/version/CMakeLists.txt +++ b/source/version/CMakeLists.txt @@ -33,16 +33,16 @@ include(SecurityFlags) string(TOUPPER ${META_PROJECT_NAME} META_PROJECT_NAME_UPPER) string(TOLOWER ${META_PROJECT_NAME} META_PROJECT_NAME_LOWER) -set(template_include_path "${CMAKE_CURRENT_SOURCE_DIR}/include/${target}") - -set(include_path "${CMAKE_BINARY_DIR}/source/include/${META_PROJECT_NAME_LOWER}") +set(include_path "${CMAKE_CURRENT_SOURCE_DIR}/include/${target}") +set(include_binary_path "${CMAKE_BINARY_DIR}/source/include/${META_PROJECT_NAME_LOWER}") set(source_path "${CMAKE_CURRENT_SOURCE_DIR}/source") # Generate version-header -configure_file(${template_include_path}/version.h.in ${include_path}/${META_PROJECT_NAME_LOWER}_version.h) +configure_file(${include_path}/version.h.in ${include_binary_path}/${META_PROJECT_NAME_LOWER}_version.h) set(headers - ${include_path}/${META_PROJECT_NAME_LOWER}_version.h + ${include_binary_path}/${META_PROJECT_NAME_LOWER}_version.h + ${include_path}/version.h ) set(sources diff --git a/source/version/include/version/version.h b/source/version/include/version/version.h new file mode 100644 index 000000000..9c78a5319 --- /dev/null +++ b/source/version/include/version/version.h @@ -0,0 +1,36 @@ +/* + * CMake Versioning Utility by Parra Studios + * A template for generating versioning utilities. + * + * Copyright (C) 2016 - 2021 Vicente Eduardo Ferrer Garcia + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#ifndef VERSION_H +#define VERSION_H 1 + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +VERSION_API const char *version_print_info(void); + +#ifdef __cplusplus +} +#endif + +#endif /* VERSION_H */ diff --git a/source/version/source/version.c b/source/version/source/version.c index 49e7cb6d2..4d3adfb9f 100644 --- a/source/version/source/version.c +++ b/source/version/source/version.c @@ -20,10 +20,12 @@ #include +#include + const char *version_print_info() { static const char version_info[] = - "Abstract Data Type Library " METACALL_VERSION "\n" + "Version Library " METACALL_VERSION "\n" "Copyright (C) 2016 - 2021 Vicente Eduardo Ferrer Garcia \n" #ifdef ADT_STATIC_DEFINE