Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmake: Check dependencies one by one 

It was currently done all at once. Therefore, the error message was:

CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:415 (message):
  A required package was not found

With no further information besides the full dependency list.

With this change, it will print the missing package.

Closes https://github.com/awesomeWM/awesome/pull/1253.
This commit is contained in:
Emmanuel Lepage Vallee 2016-12-02 15:49:10 -05:00 committed by Daniel Hahler
parent 5d81441c76
commit 26c0a3c2c5
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
awesomeConfig.cmake
View File

@ -115,7 +115,7 @@ endif()
pkg_check_modules(AWESOME_COMMON_REQUIRED REQUIRED pkg_check_modules(AWESOME_COMMON_REQUIRED REQUIRED
xcb>=1.6) xcb>=1.6)
pkg_check_modules(AWESOME_REQUIRED REQUIRED set(AWESOME_DEPENDENCIES
glib-2.0 glib-2.0
gdk-pixbuf-2.0 gdk-pixbuf-2.0
cairo cairo
@ -137,11 +137,20 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED
libstartup-notification-1.0>=0.10 libstartup-notification-1.0>=0.10
xproto>=7.0.15 xproto>=7.0.15
libxdg-basedir>=1.0.0 libxdg-basedir>=1.0.0
xcb-xrm) xcb-xrm
)
if(NOT AWESOME_REQUIRED_FOUND OR NOT AWESOME_COMMON_REQUIRED_FOUND) # Check the deps one by one
foreach(dependency ${AWESOME_DEPENDENCIES})
pkg_check_modules(TMP_DEP REQUIRED ${dependency})
if(NOT TMP_DEP_FOUND)
message(FATAL_ERROR) message(FATAL_ERROR)
endif() endif()
endforeach()
# Do it again, but this time with the CFLAGS/LDFLAGS
pkg_check_modules(AWESOME_REQUIRED REQUIRED ${AWESOME_DEPENDENCIES})
# On Mac OS X, the executable of Awesome has to be linked against libiconv # On Mac OS X, the executable of Awesome has to be linked against libiconv
# explicitly. Unfortunately, libiconv doesn't have its pkg-config file, # explicitly. Unfortunately, libiconv doesn't have its pkg-config file,