CI: Remove FreeBSD fork hardcoding (#797)

thunder-engine · Jul 15, 2024 · 36bdb0d · 36bdb0d
1 parent 813ec22
commit 36bdb0d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -260,9 +260,9 @@ jobs:
       uses: actions/checkout@v2
       with:
         submodules: recursive
-        repository: 'bedwardly-down/thunder-bsd'
+        repository: 'thunder-engine/thunder'
         path: 'thunder'
-        ref: 'fix-moc-freebsd'
+        ref: 'master'
 
     - name: Build Thunder
       uses: vmactions/freebsd-vm@v1

diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -38,11 +38,11 @@ set(${PROJECT_NAME}_incPaths
 if(UNIX AND NOT APPLE AND NOT LINUX)
     set(${PROJECT_NAME}_incPaths
         ${${PROJECT_NAME}_incPaths}
-        include_directories(${Qt5Gamepad_INCLUDE_DIRS})
-        include_directories(${Qt5Gui_INCLUDE_DIRS})
-        include_directories(${Qt5Svg_INCLUDE_DIRS})
-        include_directories(${Qt5Widgets_INCLUDE_DIRS})
-        include_directories(${Qt5Xml_INCLUDE_DIRS})
+        ${Qt5Gamepad_INCLUDE_DIRS}
+        ${Qt5Gui_INCLUDE_DIRS}
+        ${Qt5Svg_INCLUDE_DIRS}
+        ${Qt5Widgets_INCLUDE_DIRS}
+        ${Qt5Xml_INCLUDE_DIRS}
         "/usr/local/include"
     )
 endif()

diff --git a/modules/uikit/CMakeLists.txt b/modules/uikit/CMakeLists.txt
@@ -37,8 +37,8 @@ set(${PROJECT_NAME}_incPaths
 if(UNIX AND NOT APPLE AND NOT LINUX)
     set(${PROJECT_NAME}_incPaths
         ${${PROJECT_NAME}_incPaths}
-        include_directories(${Qt5Gui_INCLUDE_DIRS})
-        include_directories(${Qt5Widgets_INCLUDE_DIRS})
+        ${Qt5Gui_INCLUDE_DIRS}
+        ${Qt5Widgets_INCLUDE_DIRS}
         "/usr/local/include"
     )
 endif()