diff options
| author | Pierre Ossman <ossman@cendio.se> | 2020-05-01 17:18:59 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2020-05-01 18:53:31 +0200 |
| commit | ecb016fe3ff6fdcd8f9d98f5e1003d037888703e (patch) | |
| tree | 6e0ffb876565bffc4c983c9e470b93748d4caeb7 /cmake | |
| parent | 849bd567288765539665aaf1795077ee55f6b40e (diff) | |
| download | tigervnc-ecb016fe3ff6fdcd8f9d98f5e1003d037888703e.tar.gz tigervnc-ecb016fe3ff6fdcd8f9d98f5e1003d037888703e.zip | |
Switch region code to pixman
This is the current upstream so let's make use of it to get the latest
in features and fixes.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindPixman.cmake | 40 | ||||
| -rw-r--r-- | cmake/StaticBuild.cmake | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/cmake/Modules/FindPixman.cmake b/cmake/Modules/FindPixman.cmake new file mode 100644 index 00000000..7bfca77b --- /dev/null +++ b/cmake/Modules/FindPixman.cmake @@ -0,0 +1,40 @@ +# - Find Pixman +# Find the Pixman libraries +# +# This module defines the following variables: +# PIXMAN_FOUND - true if PIXMAN_INCLUDE_DIR & PIXMAN_LIBRARY are found +# PIXMAN_LIBRARIES - Set when PIXMAN_LIBRARY is found +# PIXMAN_INCLUDE_DIRS - Set when PIXMAN_INCLUDE_DIR is found +# +# PIXMAN_INCLUDE_DIR - where to find pixman.h, etc. +# PIXMAN_LIBRARY - the Pixman library +# + +#============================================================================= +# Copyright 2013 Marc-Andre Moreau <marcandre.moreau@gmail.com> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============================================================================= + +find_path(PIXMAN_INCLUDE_DIR NAMES pixman.h PATH_SUFFIXES pixman-1) + +find_library(PIXMAN_LIBRARY NAMES pixman-1) + +find_package_handle_standard_args(pixman-1 DEFAULT_MSG PIXMAN_LIBRARY PIXMAN_INCLUDE_DIR) + +if(PIXMAN-1_FOUND) + set(PIXMAN_LIBRARIES ${PIXMAN_LIBRARY}) + set(PIXMAN_INCLUDE_DIRS ${PIXMAN_INCLUDE_DIR}) +endif() + +mark_as_advanced(PIXMAN_INCLUDE_DIR PIXMAN_LIBRARY) diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake index 2f97613c..fb8c56f2 100644 --- a/cmake/StaticBuild.cmake +++ b/cmake/StaticBuild.cmake @@ -20,6 +20,7 @@ if(BUILD_STATIC) set(JPEG_LIBRARIES "-Wl,-Bstatic -ljpeg -Wl,-Bdynamic") set(ZLIB_LIBRARIES "-Wl,-Bstatic -lz -Wl,-Bdynamic") + set(PIXMAN_LIBRARY "-Wl,-Bstatic -lpixman-1 -Wl,-Bdynamic") # gettext is included in libc on many unix systems if(NOT LIBC_HAS_DGETTEXT) |