Commit ac5158194f4e97428a4f3d9633ff93b44f08bd79

Authored by caotto
2 parents 16a74356 95127b29

Merge pull request #335 from biometrics/no_svg

Remove dependency on QT5Svg
3rdparty/stasm4.0.0/CMakeLists.txt
@@ -13,7 +13,7 @@ set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSIO @@ -13,7 +13,7 @@ set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSIO
13 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/") 13 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/")
14 14
15 # Find Qt 5.0.2 15 # Find Qt 5.0.2
16 -set(QT_DEPENDENCIES Concurrent Core Gui Network Sql Svg Widgets Xml) 16 +set(QT_DEPENDENCIES Concurrent Core Gui Network Sql Widgets Xml)
17 foreach(QT_DEPENDENCY ${QT_DEPENDENCIES}) 17 foreach(QT_DEPENDENCY ${QT_DEPENDENCIES})
18 find_package(Qt5${QT_DEPENDENCY}) 18 find_package(Qt5${QT_DEPENDENCY})
19 endforeach() 19 endforeach()
CMakeLists.txt
@@ -80,7 +80,7 @@ endif() @@ -80,7 +80,7 @@ endif()
80 set(QT_DEPENDENCIES Concurrent Core) 80 set(QT_DEPENDENCIES Concurrent Core)
81 option(BR_EMBEDDED "Limit software dependencies") 81 option(BR_EMBEDDED "Limit software dependencies")
82 if(NOT ${BR_EMBEDDED}) 82 if(NOT ${BR_EMBEDDED})
83 - set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Gui Network Sql Svg Widgets Xml) 83 + set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Gui Network Sql Widgets Xml)
84 endif() 84 endif()
85 foreach(QT_DEPENDENCY ${QT_DEPENDENCIES}) 85 foreach(QT_DEPENDENCY ${QT_DEPENDENCIES})
86 find_package(Qt5${QT_DEPENDENCY}) 86 find_package(Qt5${QT_DEPENDENCY})