diff options
| author | Julian Ospald <hasufell@users.noreply.github.com> | 2016-07-13 14:47:57 +0300 |
|---|---|---|
| committer | Eion Robb <eion@robbmob.com> | 2016-07-13 14:47:57 +0300 |
| commit | d93d9703dc5c9acd788c14b40929012cb130c3c9 (patch) | |
| tree | 9ed0ea3b8c6bdb507872424e8a608a1316aff438 | |
| parent | 0cdc91f7bb67811e6e643291a3088f2804d0956c (diff) | |
Some cmake improvements for skypeweb (#457)
* Don't hardcode 'pkg-config'
* Install theme file too
* Add sanity checks in case manual pkg-config calls fail
| -rw-r--r-- | skypeweb/CMakeLists.txt | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/skypeweb/CMakeLists.txt b/skypeweb/CMakeLists.txt index df246e3..a0037ff 100644 --- a/skypeweb/CMakeLists.txt +++ b/skypeweb/CMakeLists.txt @@ -51,18 +51,32 @@ link_directories( #install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) -exec_program("pkg-config --variable=plugindir purple 2>/dev/null" - OUTPUT_VARIABLE LIB_INSTALL_DIR) +exec_program("${PKG_CONFIG_EXECUTABLE} --variable=plugindir purple 2>/dev/null" + OUTPUT_VARIABLE LIB_INSTALL_DIR + RETURN_VALUE PURPLE_PLUGINDIR_RET) + +if (NOT PURPLE_PLUGINDIR_RET EQUAL 0) + message( FATAL_ERROR "${PKG_CONFIG_EXECUTABLE} --variable=plugindir purple -- returned a non-null error code") +endif() install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) -exec_program("pkg-config --variable=datadir purple 2>/dev/null" - OUTPUT_VARIABLE PURPLE_DATADIR) +exec_program("${PKG_CONFIG_EXECUTABLE} --variable=datadir purple 2>/dev/null" + OUTPUT_VARIABLE PURPLE_DATADIR + RETURN_VALUE PURPLE_DATADIR_RET) + +if (NOT PURPLE_DATADIR_RET EQUAL 0) + message( FATAL_ERROR "${PKG_CONFIG_EXECUTABLE} --variable=datadir purple -- returned a non-null error code") +endif() install(DIRECTORY "icons/" DESTINATION "${PURPLE_DATADIR}/pixmaps/pidgin/protocols/" ) +install(FILES "theme" + DESTINATION "${PURPLE_DATADIR}/pixmaps/pidgin/emotes/skype/" + ) + # package settings set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Skype protocol plug-in for libpurple") set(CPACK_PACKAGE_VENDOR "Eionrobb") |