summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2022-05-01 11:51:47 +0200
committerSlávek Banko <slavek.banko@axis.cz>2022-05-01 11:51:47 +0200
commit91016bd1ff9470df505a12ddcc5606eb82adc84c (patch)
tree9686d4ca76a90f68794ecf5f99fa2375b0e48f83
parentff7694cd46931691d0afa8dceaa28f2c0b5ef4c2 (diff)
downloadamarok-91016bd1ff9470df505a12ddcc5606eb82adc84c.tar.gz
amarok-91016bd1ff9470df505a12ddcc5606eb82adc84c.zip
Fix Configure tests in case TQT_LIBRARY_DIRS contains multiple paths.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--ConfigureChecks.cmake10
1 files changed, 8 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index f1b7246b..bab3b80d 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -197,7 +197,10 @@ find_package( OpenGL )
tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} )
-set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} ${TQT_LIBRARIES} )
+foreach( _dirs ${TQT_LIBRARY_DIRS} )
+ list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" )
+endforeach()
+list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQT_LIBRARIES} )
check_cxx_source_compiles("
#include <cstdlib>
@@ -219,7 +222,10 @@ if( WITH_KONQSIDEBAR )
set( CMAKE_REQUIRED_DEFINITIONS ${TQT_CFLAGS_OTHER} )
set( CMAKE_REQUIRED_INCLUDES ${TDE_INCLUDE_DIR};${TQT_INCLUDE_DIRS};${CMAKE_INCLUDE_PATH} )
set( CMAKE_REQUIRED_FLAGS "-include tqt.h" )
- set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} -L${TQT_LIBRARY_DIRS} ${TQT_LIBRARIES} )
+ foreach( _dirs ${TQT_LIBRARY_DIRS} )
+ list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" )
+ endforeach()
+ list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQT_LIBRARIES} )
check_cxx_source_compiles("
#include <konqsidebarplugin.h>
int main(int, char**) { return 0; } "