diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-11-08 11:44:31 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-11-09 18:03:49 +0000 |
| commit | 857b80e41489f9064e8f5cbdd8c05b3a9ce8adb3 (patch) | |
| tree | 4dc1cca73fcb80d48c8ad5e6fcf9c8d16b526362 /ui/gtk | |
| parent | b688175834c8ab302abb108df19c63f7a075c458 (diff) | |
CMake: Use find_program to find a program.
Use find_program to find glib-compile-resources instead of find_file.
Change-Id: I565c3a596923ff4761bc38988ee396aa24bd63a6
Reviewed-on: https://code.wireshark.org/review/18714
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt index 7864570d9d..b3ec0b3e3a 100644 --- a/ui/gtk/CMakeLists.txt +++ b/ui/gtk/CMakeLists.txt @@ -272,8 +272,8 @@ if(WIN32) set(PORTAUDIO_OBJ $<TARGET_OBJECTS:portaudio>) endif() -find_file(GLIB_COMPILE_RESOURCES - glib-compile-resources${CMAKE_EXECUTABLE_SUFFIX} +find_program(GLIB_COMPILE_RESOURCES_EXECUTABLE + glib-compile-resources HINTS "${GLIB2_HINTS}/bin" ) @@ -283,7 +283,7 @@ pkg_check_modules(GRESOURCE QUIET gio-2.0>=2.32 gdk-pixbuf-2.0>=2.26) macro(WIRESHARK_GRESOURCES _outputfile _resourcefile) add_custom_command( OUTPUT ${_outputfile} - COMMAND ${GLIB_COMPILE_RESOURCES} --sourcedir=${CMAKE_SOURCE_DIR} --target=${_outputfile} --generate --manual-register ${CMAKE_CURRENT_SOURCE_DIR}/${_resourcefile} + COMMAND ${GLIB_COMPILE_RESOURCES_EXECUTABLE} --sourcedir=${CMAKE_SOURCE_DIR} --target=${_outputfile} --generate --manual-register ${CMAKE_CURRENT_SOURCE_DIR}/${_resourcefile} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_resourcefile} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) |