Stop looking for bundled libraries

This commit is contained in:
Martin Natano
2022-06-06 12:09:01 +02:00
parent c4ca141c4a
commit f47ea91e0a
4 changed files with 2 additions and 11 deletions
+1 -2
View File
@@ -14,14 +14,13 @@ jobs:
run: sudo apt-get update && sudo apt-get install -y
libasound2-dev
libgl-dev
libglew-dev
libglu1-mesa-dev
libgtk-3-dev
libjack-dev
libmad0-dev
libpulse-dev
libudev-dev
libva-dev
libvorbis-dev
libxinerama-dev
libx11-dev
libxrandr-dev
-4
View File
@@ -324,9 +324,6 @@ elseif(LINUX)
set(HAS_X11 TRUE)
endif()
find_package("ZLIB" REQUIRED)
find_package("JPEG" REQUIRED)
find_package(Dl)
set(HAS_XRANDR FALSE)
@@ -394,7 +391,6 @@ elseif(LINUX)
set(OpenGL_GL_PREFERENCE GLVND)
find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
endif(WIN32) # LINUX, APPLE
configure_file("${SM_SRC_DIR}/config.in.hpp"
+1 -1
View File
@@ -11,7 +11,7 @@ add_library("glew" STATIC ${GLEW_SRC} ${GLEW_HPP})
set_property(TARGET "glew" PROPERTY FOLDER "External Libraries")
target_compile_definitions("glew" PRIVATE GLEW_STATIC)
target_compile_definitions("glew" PUBLIC GLEW_STATIC)
if(MSVC)
target_compile_definitions("glew" PRIVATE _MBCS)
-4
View File
@@ -152,7 +152,6 @@ if(WIN32)
target_compile_definitions("${SM_EXE_NAME}" PRIVATE _WINDOWS) # TODO: Remove this potential duplicate.
target_compile_definitions("${SM_EXE_NAME}" PRIVATE _CRT_SECURE_NO_WARNINGS)
target_compile_definitions("${SM_EXE_NAME}" PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS)
target_compile_definitions("${SM_EXE_NAME}" PRIVATE GLEW_STATIC)
set_target_properties("${SM_EXE_NAME}"
PROPERTIES RUNTIME_OUTPUT_DIRECTORY
@@ -451,9 +450,6 @@ else()
add_dependencies("${SM_EXE_NAME}" "ffmpeg")
list(APPEND SM_INCLUDE_DIRS "${SM_FFMPEG_INCLUDE}")
if(HAS_GTK3)
list(APPEND SM_INCLUDE_DIRS "${GTK3_INCLUDE_DIRS}")
endif()
if(X11_FOUND)
list(APPEND SM_INCLUDE_DIRS "${X11_INCLUDE_DIR}")
endif()