Cleanup gui (#1214)

xelatihy · Mar 25, 2021 · 0599b8b · 0599b8b
1 parent d9d55a8
commit 0599b8b
Show file tree

Hide file tree

Showing 4 changed files with 243 additions and 252 deletions.
diff --git a/.github/workflows/ubuntu-build.yml b/.github/workflows/ubuntu-build.yml
@@ -7,18 +7,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      # - name: install ubuntu dependencies
-      #   run: |
-      #     sudo apt-get update --yes
-      #     sudo apt-get install --yes ninja-build
+      - name: dependencies
+        run: |
+          sudo apt-get install xorg-dev
       - name: configure
         env:
           CC: gcc-8
           CXX: g++-8
         run: |
           mkdir build
           cd build
-          cmake .. -G"Unix Makefiles" -DYOCTO_OPENGL=OFF -DYOCTO_EMBREE=OFF -DYOCTO_DENOISE=OFF
+          cmake .. -G"Unix Makefiles" -DYOCTO_OPENGL=ON -DYOCTO_EMBREE=OFF -DYOCTO_DENOISE=OFF
       - name: build
         run: |
           cd build

diff --git a/libs/yocto_gui/CMakeLists.txt b/libs/yocto_gui/CMakeLists.txt
@@ -24,12 +24,14 @@ if(YOCTO_OPENGL)
   target_compile_definitions(yocto_gui PRIVATE -DIMGUI_IMPL_OPENGL_LOADER_GLAD)
   target_compile_definitions(yocto_gui PUBLIC -DYOCTO_OPENGL)
   set_target_properties(yocto_gui PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED YES)
-
+
+  target_link_libraries(yocto_gui PUBLIC yocto)
+
   target_include_directories(yocto_gui PRIVATE ${CMAKE_SOURCE_DIR}/exts/glfw/include)
-  target_link_libraries(yocto_gui glfw ${OPENGL_gl_LIBRARY})
+  target_link_libraries(yocto_gui PUBLIC glfw ${OPENGL_gl_LIBRARY})
 
   if(UNIX AND NOT APPLE)
-    target_link_libraries(yocto_gui dl)
+    target_link_libraries(yocto_gui PUBLIC dl)
   endif(UNIX AND NOT APPLE)
 endif(YOCTO_OPENGL)