projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9e8e84f
)
CMakeLists.txt: Drop quotes causing invalid include paths for Qt5
author
Marcus Comstedt
<marcus@mc.pp.se>
Tue, 10 Jun 2014 13:35:38 +0000
(15:35 +0200)
committer
Bert Vermeulen
<bert@biot.com>
Tue, 10 Jun 2014 15:03:41 +0000
(17:03 +0200)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index f8dd678370300feaa26c9ae0c20dfc6521b8dcaa..0cc8fbd46539980e8da0260a9595d34278de1aaf 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-77,8
+77,8
@@
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)
- 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)
add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
else()
set(QT_LIBRARIES Qt5::Gui Qt5::Widgets)
add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
else()