git.iko.soy/unity8
on xenial help sign in
Hardcode the v8 dir a bit less
commit847c3630f5a4538123d48395fecc7243073df7f9 authorAlbert Astals <albert.astals@canonical.com> dateThu 27 Jun 2013, 13:44 (13 years ago) parenta0e1e0c
2 files changed+12−4
compare with xenial
unifiedsplit
plugins/ListViewWithPageHeader/CMakeLists.txt+6−2 tests/plugins/ListViewWithPageHeader/CMakeLists.txt+6−2
plugins/ListViewWithPageHeader/CMakeLists.txt+6−2
@@ -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+
16include_directories(
27 ${CMAKE_CURRENT_SOURCE_DIR}
38 ${CMAKE_CURRENT_BINARY_DIR}
49 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
510 ${Qt5Quick_INCLUDE_DIRS}
611 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
7−# FIXME There's no cmake var for this :-/
8− /usr/include/qt5/QtV8/5.0.2/QtV8
12+ ${Qt5V8_PRIVATE_INCLUDE_DIR}
913)
1014
1115remove_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+
16include_directories(
27 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
38 ${Qt5Quick_INCLUDE_DIRS}
49 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
5−# FIXME There's no cmake var for this :-/
6− /usr/include/qt5/QtV8/5.0.2/QtV8
10+ ${Qt5V8_PRIVATE_INCLUDE_DIR}
711 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/ListViewWithPageHeader
812 ${CMAKE_CURRENT_BINARY_DIR}
913 )