Commit d10d8578 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Improving CMake configuration for tests

parent d6417bfa
# $Id:$
cmake_minimum_required( VERSION 2.8 ) cmake_minimum_required( VERSION 2.8 )
project( VABase ) project( VABase )
...@@ -7,6 +5,9 @@ list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" ) ...@@ -7,6 +5,9 @@ list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
include( VistaCommon ) include( VistaCommon )
if( NOT DEFINED ITA_VABASE_WITH_TESTS )
set( ITA_VABASE_WITH_TESTS OFF CACHE BOOL "Build VABase with tests" )
endif( NOT DEFINED ITA_VABASE_WITH_TESTS )
if( NOT DEFINED ITA_VA_BUILD_STATIC ) if( NOT DEFINED ITA_VA_BUILD_STATIC )
set( ITA_VA_BUILD_STATIC OFF CACHE BOOL "Build static VA libs" ) set( ITA_VA_BUILD_STATIC OFF CACHE BOOL "Build static VA libs" )
...@@ -66,5 +67,7 @@ endif() ...@@ -66,5 +67,7 @@ endif()
# tests # tests
if( ITA_VA_WITH_TESTS OR ITA_VABASE_WITH_TESTS )
set( VABASE_COMMON_BUILD TRUE ) set( VABASE_COMMON_BUILD TRUE )
add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" ) add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
endif()
...@@ -23,7 +23,7 @@ vista_configure_app( ObjectTest ) ...@@ -23,7 +23,7 @@ vista_configure_app( ObjectTest )
vista_install( ObjectTest ) vista_install( ObjectTest )
vista_create_default_info_file( ObjectTest ) vista_create_default_info_file( ObjectTest )
set_property( TARGET ObjectTest PROPERTY FOLDER "ITATests/VABase" ) set_property( TARGET ObjectTest PROPERTY FOLDER "VA/Tests/VABase" )
add_executable( StructTest StructTest.cpp ) add_executable( StructTest StructTest.cpp )
...@@ -33,4 +33,4 @@ vista_configure_app( StructTest ) ...@@ -33,4 +33,4 @@ vista_configure_app( StructTest )
vista_install( StructTest ) vista_install( StructTest )
vista_create_default_info_file( StructTest ) vista_create_default_info_file( StructTest )
set_property( TARGET StructTest PROPERTY FOLDER "ITATests/VABase" ) set_property( TARGET StructTest PROPERTY FOLDER "VA/Tests/VABase" )
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