Avoid `global.h` changing depending on target prefix/suffix
Just using the project name should be sufficient and this avoid `global.h` from changing when a different target prefix/suffix is used.
This commit is contained in:
parent
d8e144d312
commit
a43affa81a
|
@ -139,7 +139,7 @@ if (USE_HEADER_FOR_PUBLIC_COMPILE_DEFINITIONS)
|
||||||
endforeach ()
|
endforeach ()
|
||||||
endif ()
|
endif ()
|
||||||
set(TARGET_GENERATED_INCLUDE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include")
|
set(TARGET_GENERATED_INCLUDE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include")
|
||||||
set(TARGET_DEFINITIONS_HEADER "${TARGET_GENERATED_INCLUDE_DIRECTORY}/${META_TARGET_NAME}-definitions.h")
|
set(TARGET_DEFINITIONS_HEADER "${TARGET_GENERATED_INCLUDE_DIRECTORY}/${META_PROJECT_NAME}-definitions.h")
|
||||||
file(WRITE "${TARGET_DEFINITIONS_HEADER}" "${DEFS_FOR_HEADER}")
|
file(WRITE "${TARGET_DEFINITIONS_HEADER}" "${DEFS_FOR_HEADER}")
|
||||||
|
|
||||||
# add library to be created, set libs to link against, set version and C++ standard
|
# add library to be created, set libs to link against, set version and C++ standard
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#ifndef @META_PROJECT_VARNAME_UPPER@_GLOBAL
|
#ifndef @META_PROJECT_VARNAME_UPPER@_GLOBAL
|
||||||
#define @META_PROJECT_VARNAME_UPPER@_GLOBAL
|
#define @META_PROJECT_VARNAME_UPPER@_GLOBAL
|
||||||
|
|
||||||
#include "@META_TARGET_NAME@-definitions.h"
|
#include "@META_PROJECT_NAME@-definitions.h"
|
||||||
#include @GENERAL_GLOBAL_H_INCLUDE_PATH@
|
#include @GENERAL_GLOBAL_H_INCLUDE_PATH@
|
||||||
|
|
||||||
#ifdef @META_PROJECT_VARNAME_UPPER@_STATIC
|
#ifdef @META_PROJECT_VARNAME_UPPER@_STATIC
|
||||||
|
|
2
global.h
2
global.h
|
@ -4,7 +4,7 @@
|
||||||
#ifndef CPP_UTILITIES_GLOBAL
|
#ifndef CPP_UTILITIES_GLOBAL
|
||||||
#define CPP_UTILITIES_GLOBAL
|
#define CPP_UTILITIES_GLOBAL
|
||||||
|
|
||||||
#include "c++utilities-devel-definitions.h"
|
#include "c++utilities-definitions.h"
|
||||||
#include "application/global.h"
|
#include "application/global.h"
|
||||||
|
|
||||||
#ifdef CPP_UTILITIES_STATIC
|
#ifdef CPP_UTILITIES_STATIC
|
||||||
|
|
Loading…
Reference in New Issue