Update for OBCMake Library changes

oblivioncth · Aug 7, 2024 · 06c1ffe · 06c1ffe
1 parent 1b0c098
commit 06c1ffe
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ project(Qx
 
 # Get helper scripts
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FetchOBCMake.cmake)
-fetch_ob_cmake("v0.3.5")
+fetch_ob_cmake("96031c2fb046880cc09cb0334d117bf18ab01028")
 
 # Initialize project according to standard rules
 include(OB/Project)

diff --git a/cmake/module/Qx/ComponentHelper.cmake b/cmake/module/Qx/ComponentHelper.cmake
@@ -73,7 +73,6 @@ function(qx_add_component COMPONENT_NAME)
     )
 
     set(multiValueArgs
-        HEADERS_PRIVATE
         HEADERS_API
         IMPLEMENTATION
         DOC_ONLY
@@ -136,8 +135,6 @@ function(qx_add_component COMPONENT_NAME)
         TYPE "${COMPONENT_TYPE}"
         EXPORT_HEADER
             PATH "${PROJECT_NAMESPACE_LC}/${COMPONENT_NAME_LC}/${PROJECT_NAMESPACE_LC}_${COMPONENT_NAME_LC}_export.h"
-        HEADERS_PRIVATE
-            ${COMPONENT_HEADERS_PRIVATE}
         HEADERS_API
             COMMON "${PROJECT_NAMESPACE_LC}/${COMPONENT_NAME_LC}"
             FILES ${COMPONENT_HEADERS_API}

diff --git a/lib/core/CMakeLists.txt b/lib/core/CMakeLists.txt
@@ -1,12 +1,5 @@
 #================= Add Component ==========================
-qx_add_component("Core"
-    HEADERS_PRIVATE
-        qx-json_p.h
-        qx-processbider_p.h
-        qx-system_p.h
-        __private/qx-processwaiter.h
-        __private/qx-processwaiter_win.h
-        __private/qx-processwaiter_linux.h
+qx_add_component("Core"     
     HEADERS_API
         qx-abstracterror.h
         qx-algorithm.h
@@ -57,23 +50,28 @@ qx_add_component("Core"
         qx-iostream_linux.cpp
         qx-iostream_win.cpp
         qx-json.cpp
+        qx-json_p.h
         qx-json_p.cpp
         qx-processbider.cpp
+        qx-processbider_p.h
         qx-progressgroup.cpp
         qx-versionnumber.cpp
         qx-string.cpp
         qx-system.cpp
         qx-system_linux.cpp
         qx-system_win.cpp
+        qx-system_p.h
         qx-system_p_win.cpp
         qx-system_p_linux.cpp
         qx-systemerror.cpp
         qx-systemerror_linux.cpp
         qx-systemerror_win.cpp
         __private/qx-internalerror.cpp
-        __private/qx-processwaiter.cpp
         __private/qx-processwaiter.h
+        __private/qx-processwaiter.cpp
+        __private/qx-processwaiter_win.h
         __private/qx-processwaiter_win.cpp
+        __private/qx-processwaiter_linux.h
         __private/qx-processwaiter_linux.cpp
     DOC_ONLY
         qx-regularexpression.dox

diff --git a/lib/io/CMakeLists.txt b/lib/io/CMakeLists.txt
@@ -1,7 +1,5 @@
 #================= Add Component ==========================
 qx_add_component("Io"
-    HEADERS_PRIVATE
-        qx-common-io_p.h
     HEADERS_API
         qx-applicationlogger.h
         qx-common-io.h
@@ -16,6 +14,7 @@ qx_add_component("Io"
     IMPLEMENTATION
         qx-applicationlogger.cpp
         qx-common-io.cpp
+        qx-common-io_p.h
         qx-common-io_p.cpp
         qx-filestreamreader.cpp
         qx-filestreamwriter.cpp

diff --git a/lib/widgets/CMakeLists.txt b/lib/widgets/CMakeLists.txt
@@ -1,14 +1,13 @@
 #================= Add Component ==========================
-qx_add_component("Widgets"
-    HEADERS_PRIVATE
-        qx-common-widgets_p.h
+qx_add_component("Widgets"  
     HEADERS_API
         qx-common-widgets.h
         qx-logindialog.h
         qx-standarditemmodel.h
         qx-treeinputdialog.h
     IMPLEMENTATION
         qx-common-widgets.cpp
+        qx-common-widgets_p.h
         qx-common-widgets_p.cpp
         qx-logindialog.cpp
         qx-standarditemmodel.cpp

diff --git a/lib/windows-gui/CMakeLists.txt b/lib/windows-gui/CMakeLists.txt
@@ -1,13 +1,12 @@
 #================= Add Component ==========================
-qx_add_component("Windows-gui"
-    HEADERS_PRIVATE
-        qx-winguieventfilter_p.h
+qx_add_component("Windows-gui" 
     HEADERS_API
         qx-taskbarbutton.h
         qx-winguievent.h
     IMPLEMENTATION
         qx-taskbarbutton.cpp
         qx-winguievent.cpp
+        qx-winguieventfilter_p.h
         qx-winguieventfilter.cpp
     LINKS
         PRIVATE