Fix test breakages caused by recent build system changes

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8359 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: timlinux

tests/src/core/CMakeLists.txt

@@ -83,8 +83,8 @@ IF (APPLE)
   INSTALL(TARGETS qgis_applicationtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
   ADD_TEST(qgis_applicationtest ${CMAKE_INSTALL_PREFIX}/qgis_applicationtest)
 ELSE (APPLE)
-  INSTALL(TARGETS qgis_applicationtest RUNTIME DESTINATION ${QGIS_BIN_DIR})
-  ADD_TEST(qgis_applicationtest ${QGIS_BIN_DIR}/qgis_applicationtest)
+  INSTALL(TARGETS qgis_applicationtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+  ADD_TEST(qgis_applicationtest ${CMAKE_INSTALL_PREFIX}/bin/qgis_applicationtest)
 ENDIF (APPLE)
 #
 # QgsFileWriter test
@@ -104,8 +104,8 @@ IF (APPLE)
   INSTALL(TARGETS qgis_filewritertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
   ADD_TEST(qgis_filewritertest ${CMAKE_INSTALL_PREFIX}/qgis_filewritertest)
 ELSE (APPLE)
-  INSTALL(TARGETS qgis_filewritertest RUNTIME DESTINATION ${QGIS_BIN_DIR})
-  ADD_TEST(qgis_filewritertest ${QGIS_BIN_DIR}/qgis_filewritertest)
+  INSTALL(TARGETS qgis_filewritertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+  ADD_TEST(qgis_filewritertest ${CMAKE_INSTALL_PREFIX}/bin/qgis_filewritertest)
 ENDIF (APPLE)
 #
 # QgsRasterLayer test
@@ -125,8 +125,8 @@ IF (APPLE)
   ADD_TEST(qgis_rasterlayertest ${CMAKE_INSTALL_PREFIX}/qgis_rasterlayertest)
   INSTALL(TARGETS qgis_rasterlayertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
 ELSE (APPLE)
-  ADD_TEST(qgis_rasterlayertest ${QGIS_BIN_DIR}/qgis_rasterlayertest)
-  INSTALL(TARGETS qgis_rasterlayertest RUNTIME DESTINATION ${QGIS_BIN_DIR})
+  ADD_TEST(qgis_rasterlayertest ${CMAKE_INSTALL_PREFIX}/bin/qgis_rasterlayertest)
+  INSTALL(TARGETS qgis_rasterlayertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 ENDIF (APPLE)
 #
 # QgsMapLayer test
@@ -146,8 +146,8 @@ IF (APPLE)
   INSTALL(TARGETS qgis_maplayertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
   ADD_TEST(qgis_maplayertest ${CMAKE_INSTALL_PREFIX}/qgis_maplayertest)
 ELSE (APPLE)
-  INSTALL(TARGETS qgis_maplayertest RUNTIME DESTINATION ${QGIS_BIN_DIR})
-  ADD_TEST(qgis_maplayertest ${QGIS_BIN_DIR}/qgis_maplayertest)
+  INSTALL(TARGETS qgis_maplayertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+  ADD_TEST(qgis_maplayertest ${CMAKE_INSTALL_PREFIX}/bin/qgis_maplayertest)
 ENDIF (APPLE)
 #
 # Qgs Renderers test (qsinglesymbol renderer etc)
@@ -167,8 +167,8 @@ IF (APPLE)
   INSTALL(TARGETS qgis_rendererstest  RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
   ADD_TEST(qgis_rendererstest ${CMAKE_INSTALL_PREFIX}/qgis_rendererstest)
 ELSE (APPLE)
-  INSTALL(TARGETS qgis_rendererstest RUNTIME DESTINATION ${QGIS_BIN_DIR})
-  ADD_TEST(qgis_rendererstest ${QGIS_BIN_DIR}/qgis_rendererstest)
+  INSTALL(TARGETS qgis_rendererstest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+  ADD_TEST(qgis_rendererstest ${CMAKE_INSTALL_PREFIX}/bin/qgis_rendererstest)
 ENDIF (APPLE)
 #
 # QgsMapRender test
@@ -188,8 +188,8 @@ IF (APPLE)
   INSTALL(TARGETS qgis_maprendertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
   ADD_TEST(qgis_maprendertest ${CMAKE_INSTALL_PREFIX}/qgis_maprendertest)
 ELSE (APPLE)
-  INSTALL(TARGETS qgis_maprendertest RUNTIME DESTINATION ${QGIS_BIN_DIR})
-  ADD_TEST(qgis_maprendertest ${QGIS_BIN_DIR}/qgis_maprendertest)
+  INSTALL(TARGETS qgis_maprendertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+  ADD_TEST(qgis_maprendertest ${CMAKE_INSTALL_PREFIX}/bin/qgis_maprendertest)
 ENDIF (APPLE)
 #
 # QgsGeometry test
@@ -209,8 +209,8 @@ IF (APPLE)
   INSTALL(TARGETS qgis_geometrytest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
   ADD_TEST(qgis_geometrytest ${CMAKE_INSTALL_PREFIX}/qgis_geometrytest)
 ELSE (APPLE)
-  INSTALL(TARGETS qgis_geometrytest RUNTIME DESTINATION ${QGIS_BIN_DIR})
-  ADD_TEST(qgis_geometrytest ${QGIS_BIN_DIR}/qgis_geometrytest)
+  INSTALL(TARGETS qgis_geometrytest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+  ADD_TEST(qgis_geometrytest ${CMAKE_INSTALL_PREFIX}/bin/qgis_geometrytest)
 ENDIF (APPLE)