base: Fix generated header inclusion

obsproject · Mar 27, 2023 · 21886ad · 21886ad
1 parent c85d914
commit 21886ad
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -127,8 +127,8 @@ target_sources(
 
 target_sources(obs-websocket PRIVATE deps/qr/cpp/QrCode.cpp deps/qr/cpp/QrCode.hpp)
 
-configure_file(src/plugin-macros.h.in src/plugin-macros.generated.h)
-target_sources(obs-websocket PRIVATE src/plugin-macros.generated.h)
+configure_file(src/plugin-macros.h.in plugin-macros.generated.h)
+target_sources(obs-websocket PRIVATE plugin-macros.generated.h)
 
 target_compile_definitions(
   obs-websocket PRIVATE ASIO_STANDALONE $<$<BOOL:PLUGIN_TESTS>:PLUGIN_TESTS>

diff --git a/cmake/legacy.cmake b/cmake/legacy.cmake
@@ -32,8 +32,7 @@ find_package(Asio 1.12.1 REQUIRED)
 add_definitions(-DASIO_STANDALONE)
 
 # Configure files
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/plugin-macros.h.in
-               ${CMAKE_CURRENT_SOURCE_DIR}/src/plugin-macros.generated.h)
+configure_file(src/plugin-macros.h.in plugin-macros.generated.h)
 
 # Setup target
 add_library(obs-websocket MODULE)
@@ -49,6 +48,8 @@ if(_QT_VERSION EQUAL 6 AND OS_WINDOWS)
   set_target_properties(obs-websocket PROPERTIES AUTORCC_OPTIONS "--format-version;1")
 endif()
 
+target_include_directories(obs-websocket PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
 target_sources(
   obs-websocket
   PRIVATE src/obs-websocket.cpp

diff --git a/src/eventhandler/EventHandler.h b/src/eventhandler/EventHandler.h
@@ -27,7 +27,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "../obs-websocket.h"
 #include "../utils/Obs.h"
 #include "../utils/Obs_VolumeMeter.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 class EventHandler {
 public:

diff --git a/src/forms/ConnectInfo.h b/src/forms/ConnectInfo.h
@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <QtWidgets/QDialog>
 
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 #include "ui_ConnectInfo.h"
 

diff --git a/src/forms/SettingsDialog.h b/src/forms/SettingsDialog.h
@@ -23,7 +23,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QTimer>
 
 #include "ConnectInfo.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 #include "ui_SettingsDialog.h"
 

diff --git a/src/requesthandler/RequestHandler.h b/src/requesthandler/RequestHandler.h
@@ -30,7 +30,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "../websocketserver/rpc/WebSocketSession.h"
 #include "../obs-websocket.h"
 #include "../utils/Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 class RequestHandler;
 typedef RequestResult (RequestHandler::*RequestMethodHandler)(const Request &);

diff --git a/src/utils/Crypto.cpp b/src/utils/Crypto.cpp
@@ -22,7 +22,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QRandomGenerator>
 
 #include "Crypto.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 static const char allowedChars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 static const int allowedCharsCount = static_cast<int>(sizeof(allowedChars) - 1);

diff --git a/src/utils/Json.cpp b/src/utils/Json.cpp
@@ -19,7 +19,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include "Json.h"
 #include "Platform.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 bool Utils::Json::JsonArrayIsValidObsArray(const json &j)
 {

diff --git a/src/utils/Obs.cpp b/src/utils/Obs.cpp
@@ -18,4 +18,4 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
diff --git a/src/utils/Obs_ActionHelper.cpp b/src/utils/Obs_ActionHelper.cpp
@@ -17,7 +17,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 struct CreateSceneItemData {
 	obs_source_t *source;                             // In

diff --git a/src/utils/Obs_ArrayHelper.cpp b/src/utils/Obs_ArrayHelper.cpp
@@ -20,7 +20,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <algorithm>
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 static std::vector<std::string> ConvertStringArray(char **array)
 {

diff --git a/src/utils/Obs_NumberHelper.cpp b/src/utils/Obs_NumberHelper.cpp
@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <util/util_uint64.h>
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 uint64_t Utils::Obs::NumberHelper::GetOutputDuration(obs_output_t *output)
 {

diff --git a/src/utils/Obs_ObjectHelper.cpp b/src/utils/Obs_ObjectHelper.cpp
@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include "Obs.h"
 #include "../obs-websocket.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 json Utils::Obs::ObjectHelper::GetStats()
 {

diff --git a/src/utils/Obs_SearchHelper.cpp b/src/utils/Obs_SearchHelper.cpp
@@ -17,7 +17,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 obs_hotkey_t *Utils::Obs::SearchHelper::GetHotkeyByName(std::string name)
 {

diff --git a/src/utils/Obs_StringHelper.cpp b/src/utils/Obs_StringHelper.cpp
@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QString>
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 #define CASE(x) \
 	case x: \

diff --git a/src/utils/Platform.cpp b/src/utils/Platform.cpp
@@ -25,7 +25,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <obs-frontend-api.h>
 
 #include "Platform.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 std::string Utils::Platform::GetLocalAddress()
 {

diff --git a/src/websocketserver/WebSocketServer.h b/src/websocketserver/WebSocketServer.h
@@ -32,7 +32,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "types/WebSocketOpCode.h"
 #include "../utils/Json.h"
 #include "../requesthandler/rpc/Request.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 class WebSocketServer : QObject {
 	Q_OBJECT

diff --git a/src/websocketserver/rpc/WebSocketSession.h b/src/websocketserver/rpc/WebSocketSession.h
@@ -24,7 +24,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <atomic>
 #include <memory>
 
-#include "../../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 class WebSocketSession;
 typedef std::shared_ptr<WebSocketSession> SessionPtr;