diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-05-01 11:51:47 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-05-03 08:50:22 +0200 |
| commit | 9cfadf6f7488590d8662b229d5a5fe6e37d08cec (patch) | |
| tree | 230445a0dc7646ce6edd42166bc7e5305d75bc34 | |
| parent | 355324adda588ccc251b3eb5ef5ff5ce7b55c916 (diff) | |
| download | amarok-9cfadf6f7488590d8662b229d5a5fe6e37d08cec.tar.gz amarok-9cfadf6f7488590d8662b229d5a5fe6e37d08cec.zip | |
Fix Configure tests in case TQT_LIBRARY_DIRS contains multiple paths.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 91016bd1ff9470df505a12ddcc5606eb82adc84c)
| -rw-r--r-- | ConfigureChecks.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index d9e923ca..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${QT_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; } " |