Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
7af7045c
Commit
7af7045c
authored
4 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Use system GTK, GDK, X11, find with pkg-config
parent
0e1500a0
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/cmake/UI.cmake
+24
-25
24 additions, 25 deletions
indra/cmake/UI.cmake
with
24 additions
and
25 deletions
indra/cmake/UI.cmake
+
24
−
25
View file @
7af7045c
...
@@ -15,12 +15,12 @@ if (USESYSTEMLIBS)
...
@@ -15,12 +15,12 @@ if (USESYSTEMLIBS)
gmodule-2.0
gmodule-2.0
gtk+-2.0
gtk+-2.0
gthread-2.0
gthread-2.0
libpng
pango
pango
pangoft2
pangoft2
pangox
pangox
pangoxft
pangoxft
sdl
x11
xinerama
)
)
endif
(
LINUX
)
endif
(
LINUX
)
...
@@ -32,36 +32,35 @@ if (USESYSTEMLIBS)
...
@@ -32,36 +32,35 @@ if (USESYSTEMLIBS)
add_definitions
(
${${
pkg
}
_CFLAGS_OTHERS
}
)
add_definitions
(
${${
pkg
}
_CFLAGS_OTHERS
}
)
endforeach
(
pkg
)
endforeach
(
pkg
)
else
(
USESYSTEMLIBS
)
else
(
USESYSTEMLIBS
)
if
(
LINUX
)
use_prebuilt_binary
(
gtk-atk-pango-glib
)
endif
(
LINUX
)
if
(
LINUX
)
if
(
LINUX
)
set
(
UI_LIBRARIES
include
(
FindPkgConfig
)
atk-1.0
gdk-x11-2.0
set
(
PKGCONFIG_PACKAGES
gdk_pixbuf-2.0
atk
Xinerama
cairo
gdk-2.0
gdk-pixbuf-2.0
glib-2.0
glib-2.0
gmodule-2.0
gmodule-2.0
g
object
-2.0
g
tk+
-2.0
gthread-2.0
gthread-2.0
gtk-x11-2.0
pango
pango
-1.0
pango
ft2
pango
ft2-1.0
pango
x
pangox
-1.0
pangox
ft
pangoxft-1.0
x11
${
FREETYPE_LIBRARIES
}
xinerama
)
)
endif
(
LINUX
)
include_directories
(
foreach
(
pkg
${
PKGCONFIG_PACKAGES
}
)
${
LIBS_PREBUILT_DIR
}
/include
pkg_check_modules
(
${
pkg
}
REQUIRED
${
pkg
}
)
${
LIBS_PREBUILT_DIR
}
/include
include_directories
(
${${
pkg
}
_INCLUDE_DIRS
}
)
)
link_directories
(
${${
pkg
}
_LIBRARY_DIRS
}
)
foreach
(
include
${${
LL_ARCH
}
_INCLUDES
}
)
list
(
APPEND UI_LIBRARIES
${${
pkg
}
_LIBRARIES
}
)
include_directories
(
${
LIBS_PREBUILT_DIR
}
/include/
${
include
}
)
add_definitions
(
${${
pkg
}
_CFLAGS_OTHERS
}
)
endforeach
(
include
)
endforeach
(
pkg
)
endif
(
LINUX
)
endif
(
USESYSTEMLIBS
)
endif
(
USESYSTEMLIBS
)
if
(
LINUX
)
if
(
LINUX
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment