make it possible to test the imports too

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/cmake/runtest.sh.cmake b/cmake/runtest.sh.cmake
index d619d97..b4f351a 100644 (file)
--- a/cmake/runtest.sh.cmake
+++ b/cmake/runtest.sh.cmake
@@ -5,6 +5,7 @@ set -e
 export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib"
 export QTDIR="@CMAKE_SOURCE_DIR@"
 export QT_PLUGIN_PATH="@CMAKE_BINARY_DIR@/plugins"
+export QML_IMPORT_PATH="@CMAKE_BINARY_DIR@/imports"
 
 cd "$(dirname "$1")"
 exec "./$(basename "$1")"

diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD
index 606687f..3408cb5 100644 (file)
--- a/package/archlinux/PKGBUILD
+++ b/package/archlinux/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ivailo Monev <xakepa10@gmail.com>
 
 pkgname=katie-git
-pkgver=4.9.0.6f7d8c4f
+pkgver=4.9.0.d56802c3
 pkgrel=1
 pkgdesc='C++ toolkit derived from the Qt 4.8 framework'
 arch=('i686' 'x86_64')

diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
index 9587498..90f6f03 100644 (file)
--- a/src/imports/CMakeLists.txt
+++ b/src/imports/CMakeLists.txt
@@ -12,14 +12,32 @@ include_directories(
     ${CMAKE_BINARY_DIR}/privateinclude/QtDeclarative
     ${CMAKE_BINARY_DIR}/include/QtScript
     ${CMAKE_BINARY_DIR}/privateinclude/QtScript
-    ${CMAKE_CURRENT_SOURCE_DIR}/folderlistmodel
-    ${CMAKE_CURRENT_SOURCE_DIR}/particles
-    ${CMAKE_CURRENT_SOURCE_DIR}/gestures
-    ${CMAKE_CURRENT_BINARY_DIR}/folderlistmodel
-    ${CMAKE_CURRENT_BINARY_DIR}/particles
-    ${CMAKE_CURRENT_BINARY_DIR}/gestures
 )
 
-include(folderlistmodel/folderlistmodel.cmake)
-include(particles/particles.cmake)
-include(gestures/gestures.cmake)
+# place the imports in a sub-directory the leading of which can be used as imports path,
+# this makes testing without installation possible and is relied upon in the test script
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/imports/Qt/labs/folderlistmodel")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/imports/Qt/labs/folderlistmodel")
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/folderlistmodel/qmldir"
+    "${CMAKE_BINARY_DIR}/imports/Qt/labs/folderlistmodel/qmldir"
+)
+add_subdirectory(folderlistmodel)
+
+
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/imports/Qt/labs/particles")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/imports/Qt/labs/particles")
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/particles/qmldir"
+    "${CMAKE_BINARY_DIR}/imports/Qt/labs/particles/qmldir"
+)
+add_subdirectory(particles)
+
+
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/imports/Qt/labs/gestures")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/imports/Qt/labs/gestures")
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/gestures/qmldir"
+    "${CMAKE_BINARY_DIR}/imports/Qt/labs/gestures/qmldir"
+)
+add_subdirectory(gestures)

diff --git a/src/imports/folderlistmodel/folderlistmodel.cmake b/src/imports/folderlistmodel/CMakeLists.txt
similarity index 67%
rename from src/imports/folderlistmodel/folderlistmodel.cmake
rename to src/imports/folderlistmodel/CMakeLists.txt
index 1a6c13a..8111eca 100644 (file)
--- a/src/imports/folderlistmodel/folderlistmodel.cmake
+++ b/src/imports/folderlistmodel/CMakeLists.txt
@@ -2,12 +2,12 @@
 set(EXTRA_FOLDERLISTMODEL_LIBS KtDeclarative)
 
 set(FOLDERLISTMODEL_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/folderlistmodel/qdeclarativefolderlistmodel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/folderlistmodel/folderlistmodel.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qdeclarativefolderlistmodel.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/folderlistmodel.cpp
 )
 
 set(FOLDERLISTMODEL_HEADERS
-    ${CMAKE_CURRENT_SOURCE_DIR}/folderlistmodel/qdeclarativefolderlistmodel.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qdeclarativefolderlistmodel.h
 )
 
 katie_setup_target(qmlfolderlistmodelplugin ${FOLDERLISTMODEL_SOURCES} ${FOLDERLISTMODEL_HEADERS})
@@ -20,6 +20,6 @@ install(
     DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/folderlistmodel
 )
 install(
-    FILES ${CMAKE_CURRENT_SOURCE_DIR}/folderlistmodel/qmldir
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/qmldir
     DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/folderlistmodel
 )

diff --git a/src/imports/gestures/gestures.cmake b/src/imports/gestures/CMakeLists.txt
similarity index 66%
rename from src/imports/gestures/gestures.cmake
rename to src/imports/gestures/CMakeLists.txt
index 9a1cc95..3088e92 100644 (file)
--- a/src/imports/gestures/gestures.cmake
+++ b/src/imports/gestures/CMakeLists.txt
@@ -2,12 +2,12 @@
 set(EXTRA_GESTURES_LIBS KtDeclarative)
 
 set(GESTURES_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/gestures/qdeclarativegesturearea.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/gestures/gestures.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qdeclarativegesturearea.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/gestures.cpp
 )
 
 set(GESTURES_HEADERS
-    ${CMAKE_CURRENT_SOURCE_DIR}/gestures/qdeclarativegesturearea_p.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qdeclarativegesturearea_p.h
 )
 
 katie_setup_target(qmlgesturesplugin ${GESTURES_SOURCES} ${GESTURES_HEADERS})
@@ -20,6 +20,6 @@ install(
     DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/gestures
 )
 install(
-    FILES ${CMAKE_CURRENT_SOURCE_DIR}/gestures/qmldir
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/qmldir
     DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/gestures
 )

diff --git a/src/imports/particles/particles.cmake b/src/imports/particles/CMakeLists.txt
similarity index 67%
rename from src/imports/particles/particles.cmake
rename to src/imports/particles/CMakeLists.txt
index b5cfc21..81a831c 100644 (file)
--- a/src/imports/particles/particles.cmake
+++ b/src/imports/particles/CMakeLists.txt
@@ -2,12 +2,12 @@
 set(EXTRA_PARTICLES_LIBS KtDeclarative)
 
 set(PARTICLES_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/particles/qdeclarativeparticles.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/particles/particles.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qdeclarativeparticles.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/particles.cpp
 )
 
 set(PARTICLES_HEADERS
-    ${CMAKE_CURRENT_SOURCE_DIR}/particles/qdeclarativeparticles_p.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qdeclarativeparticles_p.h
 )
 
 katie_setup_target(qmlparticlesplugin ${PARTICLES_SOURCES} ${PARTICLES_HEADERS})
@@ -20,6 +20,6 @@ install(
     DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/particles
 )
 install(
-    FILES ${CMAKE_CURRENT_SOURCE_DIR}/particles/qmldir
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/qmldir
     DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/particles
 )