diff --git a/CMakeLists.txt b/CMakeLists.txt index 5621ea8..f87ecdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ if(APPLE) set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") set(MACOSX_PLUGIN_GUI_IDENTIFIER "${MACOS_BUNDLEID}") - set(MACOSX_PLUGIN_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION}") + set(MACOSX_PLUGIN_BUNDLE_VERSION "${PROJECT_VERSION}") set(MACOSX_PLUGIN_SHORT_VERSION_STRING "1") endif() diff --git a/ci/ci_includes.cmd.in b/ci/ci_includes.cmd.in index e347729..216e2b8 100644 --- a/ci/ci_includes.cmd.in +++ b/ci/ci_includes.cmd.in @@ -1,2 +1,2 @@ -set PluginName=@CMAKE_PROJECT_NAME@ -set PluginVersion=@CMAKE_PROJECT_VERSION@ +set PluginName=@PROJECT_NAME@ +set PluginVersion=@PROJECT_VERSION@ diff --git a/ci/ci_includes.sh.in b/ci/ci_includes.sh.in index 50f532c..71ce26c 100644 --- a/ci/ci_includes.sh.in +++ b/ci/ci_includes.sh.in @@ -1,5 +1,5 @@ -PLUGIN_NAME="@CMAKE_PROJECT_NAME@" -PLUGIN_VERSION="@CMAKE_PROJECT_VERSION@" +PLUGIN_NAME="@PROJECT_NAME@" +PLUGIN_VERSION="@PROJECT_VERSION@" MACOS_BUNDLEID="@MACOS_BUNDLEID@" LINUX_MAINTAINER_EMAIL="@LINUX_MAINTAINER_EMAIL@" PKG_SUFFIX='@PKG_SUFFIX@' diff --git a/cmake/ObsPluginHelpers.cmake b/cmake/ObsPluginHelpers.cmake index a27b4b9..ca4e5fb 100644 --- a/cmake/ObsPluginHelpers.cmake +++ b/cmake/ObsPluginHelpers.cmake @@ -225,9 +225,9 @@ else() endif() if(OS_LINUX) - set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}") + set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${LINUX_MAINTAINER_EMAIL}") - set(CPACK_PACKAGE_VERSION "${CMAKE_PROJECT_VERSION}") + set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") set(PKG_SUFFIX "-linux-x86_64" CACHE STRING "Suffix of package name") set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${PKG_SUFFIX}") diff --git a/installer/installer-Windows.iss.in b/installer/installer-Windows.iss.in index 323272b..1ffed1e 100644 --- a/installer/installer-Windows.iss.in +++ b/installer/installer-Windows.iss.in @@ -1,5 +1,5 @@ -#define MyAppName "@CMAKE_PROJECT_NAME@" -#define MyAppVersion "@CMAKE_PROJECT_VERSION@" +#define MyAppName "@PROJECT_NAME@" +#define MyAppVersion "@PROJECT_VERSION@" #define MyAppPublisher "@PLUGIN_AUTHOR@" #define MyAppURL "http://www.mywebsite.com" diff --git a/installer/installer-macOS.pkgproj.in b/installer/installer-macOS.pkgproj.in index d5d8ee9..d410f50 100644 --- a/installer/installer-macOS.pkgproj.in +++ b/installer/installer-macOS.pkgproj.in @@ -63,7 +63,7 @@ GID 80 PATH - ../@RELATIVE_INSTALL_PATH@/@CMAKE_PROJECT_NAME@@FIRST_DIR_SUFFIX@ + ../@RELATIVE_INSTALL_PATH@/@PROJECT_NAME@@FIRST_DIR_SUFFIX@ PATH_TYPE 1 PERMISSIONS @@ -521,7 +521,7 @@ LOCATION 0 NAME - @CMAKE_PROJECT_NAME@ + @PROJECT_NAME@ OVERWRITE_PERMISSIONS PAYLOAD_SIZE @@ -533,7 +533,7 @@ USE_HFS+_COMPRESSION VERSION - @CMAKE_PROJECT_VERSION@ + @PROJECT_VERSION@ TYPE 0 @@ -905,7 +905,7 @@ NAME - @CMAKE_PROJECT_NAME@@PKG_SUFFIX@ + @PROJECT_NAME@@PKG_SUFFIX@ PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/plugin-macros.h.in b/plugin-macros.h.in index a7f1b83..2b21891 100644 --- a/plugin-macros.h.in +++ b/plugin-macros.h.in @@ -20,8 +20,8 @@ #ifndef PLUGIN_MACROS_H #define PLUGIN_MACROS_H -#define PLUGIN_NAME "@CMAKE_PROJECT_NAME@" -#define PLUGIN_VERSION "@CMAKE_PROJECT_VERSION@" +#define PLUGIN_NAME "@PROJECT_NAME@" +#define PLUGIN_VERSION "@PROJECT_VERSION@" #define blog(level, msg, ...) blog(level, "[" PLUGIN_NAME "] " msg, ##__VA_ARGS__)