Skip to content

[DONT-MERGE-YET] Remove unnecessary dependencies in CMake. #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zapolnov wants to merge 1 commit into from
Closed

[DONT-MERGE-YET] Remove unnecessary dependencies in CMake. #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 0 additions & 57 deletions build/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,16 @@ project(${name})
# Otherwise VCPKG does not set the CMAKE_PREFIX_PATH to find packages.
find_package(myci CONFIG REQUIRED)

find_package(JPEG REQUIRED)
find_package(PNG REQUIRED)
find_package(GLEW REQUIRED)
find_package(Freetype CONFIG REQUIRED)

if(LINUX)
find_package(PkgConfig REQUIRED)
pkg_check_modules(GDK3 REQUIRED IMPORTED_TARGET "gdk-3.0")
pkg_check_modules(X11 REQUIRED IMPORTED_TARGET "x11")
pkg_check_modules(EGL REQUIRED IMPORTED_TARGET "egl")
pkg_check_modules(GLES2 REQUIRED IMPORTED_TARGET "glesv2")
set(linux_deps
PkgConfig::GDK3
PkgConfig::X11
PkgConfig::EGL
PkgConfig::GLES2
)
set(windows_deps)
elseif(WIN32)
find_package(unofficial-angle CONFIG REQUIRED)
set(linux_deps)
set(windows_deps
unofficial::angle::libGLESv2
unofficial::angle::libEGL
)
else()
set(linux_deps)
set(windows_deps)
endif()

set(srcs)
Expand All @@ -54,28 +36,10 @@ myci_declare_library(${name}-opengl
PUBLIC_COMPILE_DEFINITIONS
"RUISAPP_RENDER_OPENGL"
DEPENDENCIES
rasterimage
r4
papki
tml
utki
agg
veg
mikroxml
cssom
svgdom
svgren
opros
nitki
ruis
ruis-render-opengl
EXTERNAL_DEPENDENCIES
JPEG::JPEG
PNG::PNG
GLEW::GLEW
Freetype::Freetype
${linux_deps}
${windows_deps}
NO_EXPORT
)

Expand All @@ -90,26 +54,9 @@ myci_declare_library(${name}-opengles
PUBLIC_COMPILE_DEFINITIONS
"RUISAPP_RENDER_OPENGLES"
DEPENDENCIES
rasterimage
r4
papki
tml
utki
agg
veg
mikroxml
cssom
svgdom
svgren
nitki
ruis
ruis-render-opengles
EXTERNAL_DEPENDENCIES
JPEG::JPEG
PNG::PNG
Freetype::Freetype
${linux_deps}
${windows_deps}
NO_EXPORT
)

Expand All @@ -134,7 +81,6 @@ myci_declare_application(${name}-opengl-test
../../tests/app/res
DEPENDENCIES
ruis
nitki
ruisapp::ruisapp-opengl
)

Expand All @@ -146,8 +92,5 @@ myci_declare_application(${name}-opengles-test
../../tests/app/res
DEPENDENCIES
ruis
nitki
ruisapp::ruisapp-opengles
EXTERNAL_DEPENDENCIES
${windows_deps}
)
Loading