Commit 245026f3 authored by Jan Möbius's avatar Jan Möbius
Browse files

Added OPENFLIPPER_EXECUTABLE variable to simplify tests on different platforms

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@12883 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 0ca3d32e
...@@ -35,6 +35,17 @@ if (NOT GLUT_FOUND) ...@@ -35,6 +35,17 @@ if (NOT GLUT_FOUND)
message (FATAL_ERROR "GLUT not found!") message (FATAL_ERROR "GLUT not found!")
endif () endif ()
# ========================================================================
# Configure the executables path for tests
# ========================================================================
if (APPLE)
SET( OPENFLIPPER_EXECUTABLE "${CMAKE_BINARY_DIR}/Build/OpenFlipper.app/Contents/MacOS/OpenFlipper" )
elseif( WIN32 )
SET( OPENFLIPPER_EXECUTABLE "${CMAKE_BINARY_DIR}/Build/OpenFlipper.exe" )
else()
SET( OPENFLIPPER_EXECUTABLE "${CMAKE_BINARY_DIR}/Build/bin/OpenFlipper" )
endif()
# ======================================================================== # ========================================================================
# Core Library Components (Except the Core application) # Core Library Components (Except the Core application)
# ======================================================================== # ========================================================================
......
...@@ -20,7 +20,7 @@ if(BUILD_TESTING) ...@@ -20,7 +20,7 @@ if(BUILD_TESTING)
# that pretend to be scriptable without ui are correct and the core # that pretend to be scriptable without ui are correct and the core
# can start # can start
# ======================================================================== # ========================================================================
ADD_TEST(SmootherTest ${CMAKE_BINARY_DIR}/Build/bin/OpenFlipper -b -c ) ADD_TEST(SmootherTest ${OPENFLIPPER_EXECUTABLE} -b -c )
# Timeout after 60 seconds if we havean endless loop # Timeout after 60 seconds if we havean endless loop
# Should be run serial to avoid collisons with other instances # Should be run serial to avoid collisons with other instances
...@@ -32,4 +32,7 @@ if(BUILD_TESTING) ...@@ -32,4 +32,7 @@ if(BUILD_TESTING)
PROCESSORS 1 PROCESSORS 1
) )
endif() endif()
...@@ -32,14 +32,7 @@ SET (CTEST_DROP_SITE_CDASH FALSE) ...@@ -32,14 +32,7 @@ SET (CTEST_DROP_SITE_CDASH FALSE)
# can start # can start
# ======================================================================== # ========================================================================
if (APPLE) ADD_TEST(BatchStart "${OPENFLIPPER_EXECUTABLE}" -b -c )
ADD_TEST(BatchStart ${CMAKE_BINARY_DIR}/Build/OpenFlipper.app/Contents/MacOS/OpenFlipper -b -c )
elseif( WIN32 )
ADD_TEST(BatchStart ${CMAKE_BINARY_DIR}/Build/OpenFlipper.exe -b -c )
else()
ADD_TEST(BatchStart ${CMAKE_BINARY_DIR}/Build/bin/OpenFlipper -b -c )
endif()
# Timeout after 60 seconds if we havean endless loop # Timeout after 60 seconds if we havean endless loop
# Should be run serial to avoid collisons with other instances # Should be run serial to avoid collisons with other instances
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment