projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
754602a
)
Linking QtSvg. This closes bug #369
author
Elias Oenal
<EliasOenal@gmail.com>
Sun, 2 Nov 2014 19:21:34 +0000
(20:21 +0100)
committer
Elias Oenal
<EliasOenal@gmail.com>
Sun, 2 Nov 2014 19:21:34 +0000
(20:21 +0100)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 31926adf5d5703ff4c476f635d0278389a5a2af1..8ee1d57a3d6ac2d29e826f31967c9090018c0b7a 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-81,13
+81,15
@@
if(Qt5Core_FOUND)
message("-- Using Qt5")
find_package(Qt5Widgets REQUIRED)
find_package(Qt5Gui REQUIRED)
message("-- Using Qt5")
find_package(Qt5Widgets REQUIRED)
find_package(Qt5Gui REQUIRED)
+ find_package(Qt5Svg REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
- set(QT_LIBRARIES Qt5::Gui Qt5::Widgets)
+ set(QT_LIBRARIES Qt5::Gui Qt5::Widgets
Qt5::Svg
)
add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
else()
find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
find_package(Qt4 REQUIRED)
add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
else()
find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
find_package(Qt4 REQUIRED)
+ set(QT_USE_QTSVG TRUE)
endif()
find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)
endif()
find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)