Skip to content

Commit

Permalink
Trying to solve bugs in msvc related to version library.
Browse files Browse the repository at this point in the history
  • Loading branch information
viferga committed Dec 9, 2021
1 parent 8fe06ff commit a8cf834
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 7 deletions.
2 changes: 1 addition & 1 deletion source/threading/source/threading.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>\n"

#ifdef ADT_STATIC_DEFINE
Expand Down
10 changes: 5 additions & 5 deletions source/version/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 36 additions & 0 deletions source/version/include/version/version.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* CMake Versioning Utility by Parra Studios
* A template for generating versioning utilities.
*
* Copyright (C) 2016 - 2021 Vicente Eduardo Ferrer Garcia <[email protected]>
*
* 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 <version/version_api.h>

#ifdef __cplusplus
extern "C" {
#endif

VERSION_API const char *version_print_info(void);

#ifdef __cplusplus
}
#endif

#endif /* VERSION_H */
4 changes: 3 additions & 1 deletion source/version/source/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@

#include <metacall/metacall_version.h>

#include <version/version.h>

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 <[email protected]>\n"

#ifdef ADT_STATIC_DEFINE
Expand Down

0 comments on commit a8cf834

Please sign in to comment.