From 6e1d5296c1aff6df6f1557811574ecdd7c9bf02d Mon Sep 17 00:00:00 2001
From: august-alt <77973983+august-alt@users.noreply.github.com>
Date: Thu, 10 Feb 2022 16:28:55 +0400
Subject: [PATCH] fix: update cmake file to support linker no-undefined flag

---
 src/CMakeLists.txt                               | 2 +-
 src/plugins/CMakeLists.txt                       | 2 +-
 src/plugins/preferences/drives/CMakeLists.txt    | 1 +
 src/plugins/preferences/files/CMakeLists.txt     | 1 +
 src/plugins/preferences/folders/CMakeLists.txt   | 1 +
 src/plugins/preferences/ini/CMakeLists.txt       | 1 +
 src/plugins/preferences/shares/CMakeLists.txt    | 1 +
 src/plugins/preferences/shortcuts/CMakeLists.txt | 1 +
 src/plugins/preferences/variables/CMakeLists.txt | 1 +
 src/plugins/reg/CMakeLists.txt                   | 8 ++++++++
 src/plugins/spol/CMakeLists.txt                  | 7 +++++++
 11 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e0a0c53..db354e4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 # set compiler options
 if (CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wall -Wextra -Wno-long-long")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-undef -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wall -Wextra -Wno-long-long")
 endif()
 
 macro(add_gpui_library name)
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index d3f2d56..3cf9e7a 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -18,8 +18,8 @@ endmacro(add_gpui_plugin)
 add_subdirectory(adml)
 add_subdirectory(admx)
 add_subdirectory(common)
-add_subdirectory(spol)
 add_subdirectory(pol)
 add_subdirectory(preferences)
 add_subdirectory(reg)
+add_subdirectory(spol)
 add_subdirectory(storage)
diff --git a/src/plugins/preferences/drives/CMakeLists.txt b/src/plugins/preferences/drives/CMakeLists.txt
index 5fd9e0f..04520b4 100644
--- a/src/plugins/preferences/drives/CMakeLists.txt
+++ b/src/plugins/preferences/drives/CMakeLists.txt
@@ -31,3 +31,4 @@ qt5_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 add_gpui_plugin(drives-plugin ${UI_SOURCES} ${MOC_SOURCES} ${SOURCES})
 target_link_libraries(drives-plugin Qt5::Core Qt5::Widgets)
 target_link_libraries(drives-plugin ${GPUI_LIBRARIES})
+target_link_libraries(drives-plugin xerces-c)
diff --git a/src/plugins/preferences/files/CMakeLists.txt b/src/plugins/preferences/files/CMakeLists.txt
index 6b8b4de..88ef8a6 100644
--- a/src/plugins/preferences/files/CMakeLists.txt
+++ b/src/plugins/preferences/files/CMakeLists.txt
@@ -32,3 +32,4 @@ qt5_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 add_gpui_plugin(files-plugin ${UI_SOURCES} ${MOC_SOURCES} ${SOURCES})
 target_link_libraries(files-plugin Qt5::Core Qt5::Widgets)
 target_link_libraries(files-plugin ${GPUI_LIBRARIES})
+target_link_libraries(files-plugin xerces-c)
diff --git a/src/plugins/preferences/folders/CMakeLists.txt b/src/plugins/preferences/folders/CMakeLists.txt
index adcc569..58b444f 100644
--- a/src/plugins/preferences/folders/CMakeLists.txt
+++ b/src/plugins/preferences/folders/CMakeLists.txt
@@ -32,3 +32,4 @@ qt5_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 add_gpui_plugin(folders-plugin ${UI_SOURCES} ${MOC_SOURCES} ${SOURCES})
 target_link_libraries(folders-plugin Qt5::Core Qt5::Widgets)
 target_link_libraries(folders-plugin ${GPUI_LIBRARIES})
+target_link_libraries(folders-plugin xerces-c)
diff --git a/src/plugins/preferences/ini/CMakeLists.txt b/src/plugins/preferences/ini/CMakeLists.txt
index 9275b27..0ac070a 100644
--- a/src/plugins/preferences/ini/CMakeLists.txt
+++ b/src/plugins/preferences/ini/CMakeLists.txt
@@ -32,3 +32,4 @@ qt5_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 add_gpui_plugin(ini-plugin ${UI_SOURCES} ${MOC_SOURCES} ${SOURCES})
 target_link_libraries(ini-plugin Qt5::Core Qt5::Widgets)
 target_link_libraries(ini-plugin ${GPUI_LIBRARIES})
+target_link_libraries(ini-plugin xerces-c)
diff --git a/src/plugins/preferences/shares/CMakeLists.txt b/src/plugins/preferences/shares/CMakeLists.txt
index 756bf80..e1d5db7 100644
--- a/src/plugins/preferences/shares/CMakeLists.txt
+++ b/src/plugins/preferences/shares/CMakeLists.txt
@@ -32,3 +32,4 @@ qt5_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 add_gpui_plugin(shares-plugin ${UI_SOURCES} ${MOC_SOURCES} ${SOURCES})
 target_link_libraries(shares-plugin Qt5::Core Qt5::Widgets)
 target_link_libraries(shares-plugin ${GPUI_LIBRARIES})
+target_link_libraries(shares-plugin xerces-c)
diff --git a/src/plugins/preferences/shortcuts/CMakeLists.txt b/src/plugins/preferences/shortcuts/CMakeLists.txt
index 042bba9..1cdc5d9 100644
--- a/src/plugins/preferences/shortcuts/CMakeLists.txt
+++ b/src/plugins/preferences/shortcuts/CMakeLists.txt
@@ -32,3 +32,4 @@ qt5_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 add_gpui_plugin(shortcuts-plugin ${UI_SOURCES} ${MOC_SOURCES} ${SOURCES})
 target_link_libraries(shortcuts-plugin Qt5::Core Qt5::Widgets)
 target_link_libraries(shortcuts-plugin ${GPUI_LIBRARIES})
+target_link_libraries(shortcuts-plugin xerces-c)
diff --git a/src/plugins/preferences/variables/CMakeLists.txt b/src/plugins/preferences/variables/CMakeLists.txt
index af76d90..47b88ab 100644
--- a/src/plugins/preferences/variables/CMakeLists.txt
+++ b/src/plugins/preferences/variables/CMakeLists.txt
@@ -32,3 +32,4 @@ qt5_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 add_gpui_plugin(variables-plugin ${UI_SOURCES} ${MOC_SOURCES} ${SOURCES})
 target_link_libraries(variables-plugin Qt5::Core Qt5::Widgets)
 target_link_libraries(variables-plugin ${GPUI_LIBRARIES})
+target_link_libraries(variables-plugin xerces-c)
diff --git a/src/plugins/reg/CMakeLists.txt b/src/plugins/reg/CMakeLists.txt
index 15b64e7..70bc547 100644
--- a/src/plugins/reg/CMakeLists.txt
+++ b/src/plugins/reg/CMakeLists.txt
@@ -1,3 +1,8 @@
+find_package(GPUI COMPONENTS io model REQUIRED)
+include_directories(${GPUI_INCLUDE_DIRS})
+
+find_package(Qt5 COMPONENTS Core REQUIRED)
+
 set(HEADERS
     regformat.h
 )
@@ -8,3 +13,6 @@ set(SOURCES
 )
 
 add_gpui_plugin(reg-plugin ${SOURCES})
+target_link_libraries(reg-plugin Qt5::Core)
+target_link_libraries(reg-plugin ${GPUI_LIBRARIES})
+
diff --git a/src/plugins/spol/CMakeLists.txt b/src/plugins/spol/CMakeLists.txt
index df41dab..9e721bb 100644
--- a/src/plugins/spol/CMakeLists.txt
+++ b/src/plugins/spol/CMakeLists.txt
@@ -1,3 +1,8 @@
+find_package(GPUI COMPONENTS io model REQUIRED)
+include_directories(${GPUI_INCLUDE_DIRS})
+
+find_package(Qt5 COMPONENTS Core REQUIRED)
+
 set(HEADERS
     spolformat.h
 )
@@ -8,3 +13,5 @@ set(SOURCES
 )
 
 add_gpui_plugin(spol-plugin ${SOURCES})
+target_link_libraries(spol-plugin Qt5::Core)
+target_link_libraries(spol-plugin ${GPUI_LIBRARIES})