github actions: Ubuntu lib/lib64 test

effekseer · Sep 4, 2024 · 4c3ae3d · 4c3ae3d
1 parent 88279d1
commit 4c3ae3d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -237,11 +237,9 @@ if(BUILD_VIEWER)
                         -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true
     )
     list(APPEND EFK_THIRDPARTY_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libpng/include)
-
+    list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libpng/lib)
     if(EXISTS "${ExternalProject_libpng_INSTALL_DIR}/lib64")
         list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libpng/lib64)
-    else()
-        list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libpng/lib)
     endif()
 
     if(MSVC)
@@ -287,10 +285,9 @@ if(BUILD_VIEWER)
     endif()
 
     list(APPEND EFK_THIRDPARTY_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libgd/include)
+    list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libgd/lib)
     if(EXISTS "${ExternalProject_libgd_INSTALL_DIR}/lib64")
         list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libgd/lib64)
-    else()
-        list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libgd/lib)
     endif()
 
 
@@ -339,10 +336,9 @@ if(BUILD_VIEWER OR BUILD_TEST)
         )
 
         list(APPEND EFK_THIRDPARTY_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew/include)
+        list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew/lib)
         if(EXISTS "${ExternalProject_glew_INSTALL_DIR}/lib64")
             list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew/lib64)
-        else()
-            list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew/lib)
         endif()
 
     endif()
@@ -376,10 +372,9 @@ if(BUILD_VIEWER OR BUILD_EXAMPLES OR BUILD_TEST)
     endif()
 
     list(APPEND EFK_THIRDPARTY_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glfw/include)
+    list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glfw/lib)
     if(EXISTS "${ExternalProject_glfw_INSTALL_DIR}/lib64")
         list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glfw/lib64)
-    else()
-        list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glfw/lib)
     endif()
 endif()
 

diff --git a/docs/Development/HowToBuild.md b/docs/Development/HowToBuild.md
@@ -33,7 +33,7 @@ Requirements
 
 - Required packages:
   - Ubuntu: `libx11-dev libgl1-mesa-dev libxrandr-dev libxi-dev x11proto-xf86vidmode-dev libx11-xcb-dev xorg-dev libglu1-mesa-dev libpulse-dev libgtk-3-dev libopenal-dev python3-distutils zenity`
-  - Fedora 40: `gtk3-devel pulseaudio-libs-devel openal-soft-devel mesa-libGLU-devel libX11-devel libxcb-devel libXi-devel libXrandr-devel mesa-libGL-devel python3 dotnet zenity`
+  - Fedora 40: `gtk3-devel pulseaudio-libs-devel openal-soft-devel mesa-libGLU-devel libX11-devel libxcb-devel libXi-devel libXrandr-devel mesa-libGL-devel python3 dotnet zenity ninja-build`
 
 Get code and resources
 ----------