Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: mark package variables as advanced

Browse Source 
Silence pkg_check_modules message.
This commit is contained in:
Maarten Bent
2018-11-04 16:08:07 +01:00
parent d293f94d95
commit e1b725d5be
6 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/cmake/config.cmake
View File

@@ -65,6 +65,7 @@ function(wx_write_config)
set(CXX ${CMAKE_CXX_COMPILER}) set(CXX ${CMAKE_CXX_COMPILER})
set(DMALLOC_LIBS) set(DMALLOC_LIBS)
find_program(EGREP egrep) find_program(EGREP egrep)
mark_as_advanced(EGREP)
set(EXTRALIBS_GUI) set(EXTRALIBS_GUI)
set(EXTRALIBS_HTML) set(EXTRALIBS_HTML)
set(EXTRALIBS_SDL) set(EXTRALIBS_SDL)

2
build/cmake/modules/FindFontconfig.cmake
View File

@@ -43,7 +43,7 @@ else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
# use pkg-config to get the directories and then use these values # use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls # in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(PC_FONTCONFIG fontconfig) pkg_check_modules(PC_FONTCONFIG QUIET fontconfig)
set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER}) set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER})
endif (NOT WIN32) endif (NOT WIN32)

5
build/cmake/modules/FindGStreamer.cmake
View File

@@ -61,8 +61,7 @@ endif()
# _header is the component's header, relative to the gstreamer-${GST_LIB_VERSION} directory (eg. "gst/gst.h"). # _header is the component's header, relative to the gstreamer-${GST_LIB_VERSION} directory (eg. "gst/gst.h").
# _library is the component's library name (eg. "gstreamer" or "gstvideo") # _library is the component's library name (eg. "gstreamer" or "gstvideo")
macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library) macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
# FIXME: The QUIET keyword can be used once we require CMake 2.8.2. pkg_check_modules(PC_${_component_prefix} QUIET ${_pkgconfig_name}-${GST_LIB_VERSION})
pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}-${GST_LIB_VERSION})
find_path(${_component_prefix}_INCLUDE_DIRS find_path(${_component_prefix}_INCLUDE_DIRS
NAMES ${_header} NAMES ${_header}
@@ -74,6 +73,8 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _librar
NAMES ${_library}-${GST_LIB_VERSION} NAMES ${_library}-${GST_LIB_VERSION}
HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR} HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR}
) )
mark_as_advanced(${_component_prefix}_INCLUDE_DIRS ${_component_prefix}_LIBRARIES)
endmacro() endmacro()
# ------------------------ # ------------------------

2
build/cmake/modules/FindGTK3.cmake
View File

@@ -29,7 +29,7 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(GTK3 gtk+-3.0) pkg_check_modules(GTK3 QUIET gtk+-3.0)
set(VERSION_OK TRUE) set(VERSION_OK TRUE)
if (GTK3_VERSION) if (GTK3_VERSION)
if (GTK3_FIND_VERSION_EXACT) if (GTK3_FIND_VERSION_EXACT)

2
build/cmake/modules/FindLibSoup.cmake
View File

@@ -52,3 +52,5 @@ endif()
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibSoup REQUIRED_VARS LIBSOUP_INCLUDE_DIRS LIBSOUP_LIBRARIES FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibSoup REQUIRED_VARS LIBSOUP_INCLUDE_DIRS LIBSOUP_LIBRARIES
VERSION_VAR PC_LIBSOUP_VERSION) VERSION_VAR PC_LIBSOUP_VERSION)
mark_as_advanced(LIBSOUP_LIBRARIES LIBSOUP_INCLUDE_DIRS)

2
build/cmake/modules/FindLibsecret.cmake
View File

@@ -30,7 +30,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(LIBSECRET libsecret-1) pkg_check_modules(LIBSECRET QUIET libsecret-1)
set(VERSION_OK TRUE) set(VERSION_OK TRUE)
if (LIBSECRET_VERSION) if (LIBSECRET_VERSION)