git.iko.soy/unity8
on xenial help sign in
Hardcode the v8 dir a bit less
847c363Albert Astals
plugins/ListViewWithPageHeader/CMakeLists.txt+6−2
compare with xenial
unifiedsplit
@@ -1,11 +1,15 @@
1+# There's no cmake var for v8 include path :-/
2+# so create one
3+LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
4+SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/../QtV8/${Qt5Core_VERSION_STRING}/QtV8)
5+
1include_directories(
6include_directories(
2 ${CMAKE_CURRENT_SOURCE_DIR}
7 ${CMAKE_CURRENT_SOURCE_DIR}
3 ${CMAKE_CURRENT_BINARY_DIR}
8 ${CMAKE_CURRENT_BINARY_DIR}
4 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
9 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
5 ${Qt5Quick_INCLUDE_DIRS}
10 ${Qt5Quick_INCLUDE_DIRS}
6 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
11 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
7−# FIXME There's no cmake var for this :-/
12+ ${Qt5V8_PRIVATE_INCLUDE_DIR}
8− /usr/include/qt5/QtV8/5.0.2/QtV8
9)
13)
10
14
11remove_definitions(-DQT_NO_KEYWORDS)
15remove_definitions(-DQT_NO_KEYWORDS)
tests/plugins/ListViewWithPageHeader/CMakeLists.txt+6−2
@@ -1,9 +1,13 @@
1+# There's no cmake var for v8 include path :-/
2+# so create one
3+LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
4+SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/../QtV8/${Qt5Core_VERSION_STRING}/QtV8)
5+
1include_directories(
6include_directories(
2 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
7 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
3 ${Qt5Quick_INCLUDE_DIRS}
8 ${Qt5Quick_INCLUDE_DIRS}
4 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
9 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
5−# FIXME There's no cmake var for this :-/
10+ ${Qt5V8_PRIVATE_INCLUDE_DIR}
6− /usr/include/qt5/QtV8/5.0.2/QtV8
7 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/ListViewWithPageHeader
11 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/ListViewWithPageHeader
8 ${CMAKE_CURRENT_BINARY_DIR}
12 ${CMAKE_CURRENT_BINARY_DIR}
9 )
13 )