RomanNum3ral
/
obs-streamFX
mirror of https://github.com/RomanNum3ral/obs-StreamFX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

templates: Move template files to better directory

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-08-10 01:06:20 +02:00
parent f3b3af2030
commit 0ecf971446
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -262,11 +262,11 @@ set(${PropertyPrefix}SIGN_PASSWORD "" CACHE STRING "Password for the private key
# Configure Version Header # Configure Version Header
configure_file( configure_file(
"cmake/version.hpp.in" "templates/version.hpp.in"
"${PROJECT_BINARY_DIR}/generated/version.hpp" "${PROJECT_BINARY_DIR}/generated/version.hpp"
) )
configure_file( configure_file(
"cmake/module.cpp.in" "templates/module.cpp.in"
"${PROJECT_BINARY_DIR}/generated/module.cpp" "${PROJECT_BINARY_DIR}/generated/module.cpp"
) )
@ -291,7 +291,7 @@ if(NOT TARGET libobs)
get_filename_component(ISS_MSVCHELPER_PATH "${msvc-redist-helper_BUILD_DIR}" ABSOLUTE) get_filename_component(ISS_MSVCHELPER_PATH "${msvc-redist-helper_BUILD_DIR}" ABSOLUTE)
file(TO_NATIVE_PATH "${ISS_MSVCHELPER_PATH}" ISS_MSVCHELPER_PATH) file(TO_NATIVE_PATH "${ISS_MSVCHELPER_PATH}" ISS_MSVCHELPER_PATH)
configure_file( configure_file(
"cmake/installer.iss.in" "templates/installer.iss.in"
"${PROJECT_BINARY_DIR}/installer.iss" "${PROJECT_BINARY_DIR}/installer.iss"
) )
@ -303,7 +303,7 @@ if(NOT TARGET libobs)
set(PROJECT_LEGAL_TRADEMARKS_2 "") set(PROJECT_LEGAL_TRADEMARKS_2 "")
configure_file( configure_file(
"cmake/version.rc.in" "templates/version.rc.in"
"${PROJECT_BINARY_DIR}/generated/version.rc" "${PROJECT_BINARY_DIR}/generated/version.rc"
@ONLY @ONLY
) )
@ -466,8 +466,8 @@ list(APPEND PROJECT_DATA
"data/effects/pack-unpack.effect" "data/effects/pack-unpack.effect"
) )
list(APPEND PROJECT_TEMPLATES list(APPEND PROJECT_TEMPLATES
"cmake/version.hpp.in" "templates/version.hpp.in"
"cmake/module.cpp.in" "templates/module.cpp.in"
) )
list(APPEND PROJECT_PRIVATE_SOURCE list(APPEND PROJECT_PRIVATE_SOURCE
# Plugin # Plugin
@ -534,8 +534,8 @@ list(APPEND PROJECT_PRIVATE_GENERATED
) )
if(WIN32) if(WIN32)
list(APPEND PROJECT_TEMPLATES list(APPEND PROJECT_TEMPLATES
"cmake/installer.iss.in" "templates/installer.iss.in"
"cmake/version.rc.in" "templates/version.rc.in"
) )
list(APPEND PROJECT_PRIVATE_SOURCE list(APPEND PROJECT_PRIVATE_SOURCE
"source/windll.cpp" "source/windll.cpp"
@ -902,9 +902,11 @@ set(PROJECT_PRIVATE
source_group(TREE "${PROJECT_SOURCE_DIR}/data" PREFIX "Data Files" FILES ${PROJECT_DATA}) source_group(TREE "${PROJECT_SOURCE_DIR}/data" PREFIX "Data Files" FILES ${PROJECT_DATA})
source_group(TREE "${PROJECT_SOURCE_DIR}/source" PREFIX "Code Files" FILES ${PROJECT_PRIVATE_SOURCE}) source_group(TREE "${PROJECT_SOURCE_DIR}/source" PREFIX "Code Files" FILES ${PROJECT_PRIVATE_SOURCE})
source_group(TREE "${PROJECT_BINARY_DIR}/generated" PREFIX "Generated Files" FILES ${PROJECT_PRIVATE_GENERATED}) source_group(TREE "${PROJECT_BINARY_DIR}/generated" PREFIX "Generated Files" FILES ${PROJECT_PRIVATE_GENERATED})
source_group(TREE "${PROJECT_SOURCE_DIR}/cmake" PREFIX "Template Files" FILES ${PROJECT_TEMPLATES}) source_group(TREE "${PROJECT_SOURCE_DIR}/templates" PREFIX "Template Files" FILES ${PROJECT_TEMPLATES})
source_group(TREE "${PROJECT_SOURCE_DIR}/ui" PREFIX "User Interface Files" FILES ${PROJECT_UI}) source_group(TREE "${PROJECT_SOURCE_DIR}/ui" PREFIX "User Interface Files" FILES ${PROJECT_UI})
set_source_files_properties(${PROJECT_TEMPLATES} PROPERTIES HEADER_FILE_ONLY TRUE)
################################################################################ ################################################################################
# Target # Target
################################################################################ ################################################################################

0
cmake/installer.iss.in → templates/installer.iss.in
View File

1
cmake/module.cpp.in → templates/module.cpp.in
View File

@ -17,7 +17,6 @@ MODULE_EXPORT const char* obs_module_name()
return "@PROJECT_FULL_NAME@"; return "@PROJECT_FULL_NAME@";
} }
MODULE_EXPORT const char* obs_module_description() MODULE_EXPORT const char* obs_module_description()
{ {
return "@PROJECT_DESCRIPTION@"; return "@PROJECT_DESCRIPTION@";

8
cmake/version.hpp.in → templates/version.hpp.in
View File

@ -21,7 +21,9 @@
#include <cinttypes> #include <cinttypes>
#include <cstddef> #include <cstddef>
#define STREAMFX_MAKE_VERSION(major,minor,patch,tweak) (((uint64_t(major) & 0xFFFFull) << 48ull) | ((uint64_t(minor) & 0xFFFFull) << 32ull) | ((uint64_t(patch) & 0xFFFFull) << 16ull) | ((uint64_t(tweak) & 0xFFFFull))) #define STREAMFX_MAKE_VERSION(major, minor, patch, tweak) \
(((uint64_t(major) & 0xFFFFull) << 48ull) | ((uint64_t(minor) & 0xFFFFull) << 32ull) \
| ((uint64_t(patch) & 0xFFFFull) << 16ull) | ((uint64_t(tweak) & 0xFFFFull)))
#define STREAMFX_MASK_MAJOR 0xFFFF000000000000ull #define STREAMFX_MASK_MAJOR 0xFFFF000000000000ull
#define STREAMFX_MASK_COMPAT 0xFFFFFFFF00000000ull #define STREAMFX_MASK_COMPAT 0xFFFFFFFF00000000ull
@ -34,5 +36,7 @@
#define STREAMFX_VERSION_BUILD @PROJECT_VERSION_TWEAK@ #define STREAMFX_VERSION_BUILD @PROJECT_VERSION_TWEAK@
#define STREAMFX_VERSION_TWEAK @PROJECT_VERSION_TWEAK@ #define STREAMFX_VERSION_TWEAK @PROJECT_VERSION_TWEAK@
#define STREAMFX_VERSION_SUFFIX @VERSION_SUFFIX@ #define STREAMFX_VERSION_SUFFIX @VERSION_SUFFIX@
#define STREAMFX_VERSION STREAMFX_MAKE_VERSION(STREAMFX_VERSION_MAJOR, STREAMFX_VERSION_MINOR, STREAMFX_VERSION_PATCH, STREAMFX_VERSION_BUILD) #define STREAMFX_VERSION \
STREAMFX_MAKE_VERSION(STREAMFX_VERSION_MAJOR, STREAMFX_VERSION_MINOR, STREAMFX_VERSION_PATCH, \
STREAMFX_VERSION_BUILD)
#define STREAMFX_VERSION_STRING "@VERSION_STRING@" #define STREAMFX_VERSION_STRING "@VERSION_STRING@"

0
cmake/version.rc.in → templates/version.rc.in
View File