diff options
| author | gregory guy <gregory-tde@laposte.net> | 2021-12-02 13:11:34 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-12-14 11:45:01 +0100 |
| commit | 8b408227ee9912df6051a08f3f64f76918f02222 (patch) | |
| tree | 2ef524be0bc6a8c2530743e06fe89ee6b12438d8 | |
| parent | c49da9f36fd39f7c2817d29c7fea4129e3a18b87 (diff) | |
| download | tdeedu-8b408227ee9912df6051a08f3f64f76918f02222.tar.gz tdeedu-8b408227ee9912df6051a08f3f64f76918f02222.zip | |
fix FTBFS when aRts support is not available from tdelibs.
Signed-off-by: gregory guy <gregory-tde@laposte.net>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a6b2fc4fd2f1fc67df20d015771031212072eb89)
| -rw-r--r-- | ConfigureChecks.cmake | 17 | ||||
| -rw-r--r-- | blinken/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kanagram/src/CMakeLists.txt | 2 |
3 files changed, 9 insertions, 12 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index a2d6593a..0e0d3958 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -35,19 +35,16 @@ if( BUILD_DOC AND BUILD_KIG ) endif( ) -##### check for arts +##### check for arts support if( WITH_ARTS ) - pkg_search_module( ARTS arts ) - if( NOT ARTS_FOUND ) - tde_message_fatal( "aRts is requested but was not found on your system" ) - endif( NOT ARTS_FOUND ) - set( WITHOUT_ARTS false ) -endif( WITH_ARTS ) - -if( NOT WITH_ARTS ) + if( NOT TARGET artskde-shared ) + tde_message_fatal( "aRts support through tdelibs is requested but was not found on your system" ) + endif() + set( ARTSKDE_LIBRARIES artskde-shared ) + else() set( WITHOUT_ARTS 1 ) -endif( NOT WITH_ARTS ) +endif() ##### check for boost diff --git a/blinken/src/CMakeLists.txt b/blinken/src/CMakeLists.txt index b0d1e1f4..d8776304 100644 --- a/blinken/src/CMakeLists.txt +++ b/blinken/src/CMakeLists.txt @@ -32,7 +32,7 @@ tde_add_executable( blinken AUTOMOC tdecore-shared tdeui-shared tdeio-shared - artskde-shared + ${ARTSKDE_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kanagram/src/CMakeLists.txt b/kanagram/src/CMakeLists.txt index 7686af03..a6d28d4d 100644 --- a/kanagram/src/CMakeLists.txt +++ b/kanagram/src/CMakeLists.txt @@ -44,7 +44,7 @@ tde_add_executable( kanagram AUTOMOC tdeui-shared tdeio-shared tdenewstuff-shared - artskde-shared + ${ARTSKDE_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) |