Improving CMake config.

CMakeLists.txt

@@ -8,6 +8,10 @@ list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 include( VistaCommon )
 
 
+if( NOT DEFINED ITA_VACORE_WITH_TESTS )
+	set( ITA_VACORE_WITH_TESTS OFF CACHE BOOL "Build VACore with tests" )
+endif( NOT DEFINED ITA_VACORE_WITH_TESTS )
+
 if( NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC )
 	set( ITA_CORE_LIBS_BUILD_STATIC OFF CACHE BOOL "Build all ITA core libs in static mode" )
 endif( NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC )
@@ -301,5 +305,7 @@ configure_file( "conf/VACore.ini.proto" "${CMAKE_CURRENT_SOURCE_DIR}/conf/${ITA_
 
 
 # tests
-set( VACORE_COMMON_BUILD TRUE )
-add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
+if( ITA_VA_WITH_TESTS OR ITA_VABASE_WITH_TESTS )
+	set( VACORE_COMMON_BUILD TRUE )
+	add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
+endif()

tests/CMakeLists.txt

@@ -23,7 +23,7 @@ vista_configure_app( MotionModelTest )
 vista_install( MotionModelTest )
 vista_create_default_info_file( MotionModelTest )
 
-set_property( TARGET MotionModelTest PROPERTY FOLDER "ITATests/VACore" )
+set_property( TARGET MotionModelTest PROPERTY FOLDER "VA/Tests/VACore" )
 
 
 add_executable( SceneConfigTest SceneConfigTest.cpp )
@@ -33,4 +33,4 @@ vista_configure_app( SceneConfigTest )
 vista_install( SceneConfigTest )
 vista_create_default_info_file( SceneConfigTest )
 
-set_property( TARGET SceneConfigTest PROPERTY FOLDER "ITATests/VACore" )
+set_property( TARGET SceneConfigTest PROPERTY FOLDER "VA/Tests/VACore" )