From: <ibr...@us...> - 2014-12-01 09:51:32
|
Revision: 5176 http://sourceforge.net/p/tora/code/5176 Author: ibre5041 Date: 2014-12-01 09:51:24 +0000 (Mon, 01 Dec 2014) Log Message: ----------- Fix dependency on Qt5 even when Qt4 is used Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2014-11-28 09:56:02 UTC (rev 5175) +++ trunk/tora/src/CMakeLists.txt 2014-12-01 09:51:24 UTC (rev 5176) @@ -1150,7 +1150,11 @@ "connection/tooracletraits.cpp" "connection/tooracleconnection.cpp" "connection/tooraclequery.cpp") - TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} Qt5::Core Qt5::Widgets ${TORA_LIB} "trotl") + IF(QT5_BUILD) + TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} Qt5::Core Qt5::Widgets ${TORA_LIB} "trotl") + ELSE() + TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} "trotl") + ENDIF() IF(DEFINED TORA_LIB) ADD_DEPENDENCIES(${PROVIDER_ORACLE} ${TORA_LIB}) ELSE() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |