Simplifying cmake configuration and removing banner in impl header

parent 8308160d
# $Id:$
cmake_minimum_required( VERSION 2.8 )
project( VANet )
......@@ -7,22 +5,6 @@ list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
include( VistaCommon )
if( NOT DEFINED ITA_VANET_WITH_TESTS )
set( ITA_VANET_WITH_TESTS OFF CACHE BOOL "Build VANet with tests" )
endif( NOT DEFINED ITA_VANET_WITH_TESTS )
if( NOT DEFINED ITA_VA_BUILD_STATIC )
set( ITA_VA_BUILD_STATIC OFF CACHE BOOL "Build static VA libs" )
endif( NOT DEFINED ITA_VA_BUILD_STATIC )
if( NOT DEFINED ITA_VISTA_BUILD_STATIC )
set( ITA_VISTA_BUILD_STATIC OFF CACHE BOOL "Build against static ViSTA libraries" )
endif( NOT DEFINED ITA_VISTA_BUILD_STATIC )
if( NOT DEFINED ITA_VANET_INSTALL_WITH_DLLS )
set( ITA_VANET_INSTALL_WITH_DLLS ON CACHE BOOL "Install VANet with depending DLLs (use this switch with care)" )
endif( NOT DEFINED ITA_VANET_INSTALL_WITH_DLLS )
if( NOT DEFINED ITA_VANET_VERSION_MAJOR )
set( ITA_VANET_VERSION_MAJOR "v2016" CACHE STRING "VANet version major (usually 'v' and year)" )
endif( NOT DEFINED ITA_VANET_VERSION_MAJOR )
......@@ -49,16 +31,11 @@ if( ITA_VISTA_BUILD_STATIC )
add_definitions( -DVISTABASE_STATIC -DVISTAASPECTS_STATIC -DVISTAINTERPROCCOMM_STATIC )
endif( ITA_VISTA_BUILD_STATIC )
if( NOT ITA_VA_BUILD_STATIC )
if( BUILD_SHARED_LIBS )
add_definitions( -DVANET_EXPORTS )
else( NOT ITA_VA_BUILD_STATIC )
else( )
add_definitions( -DVABASE_STATIC -DVACORE_STATIC -DVANET_STATIC )
set( BUILD_SHARED_LIBS_TEMP ${BUILD_SHARED_LIBS} )
if( BUILD_SHARED_LIBS )
set( BUILD_SHARED_LIBS OFF )
message( "Ignoring activated BUILD_SHARED_LIBS temporary because static VA requested" )
endif( BUILD_SHARED_LIBS )
endif( NOT ITA_VA_BUILD_STATIC )
endif( )
add_definitions( "-DVANET_VERSION_MAJOR=\"${ITA_VANET_VERSION_MAJOR}\"" )
add_definitions( "-DVANET_VERSION_MINOR=\"${ITA_VANET_VERSION_MINOR}\"" )
......@@ -79,12 +56,8 @@ vista_create_default_info_file( VANet )
set_property( TARGET VANet PROPERTY FOLDER "VA" )
if( ITA_VANET_INSTALL_WITH_DLLS OR ITA_VA_INSTALL_WITH_DLLS )
vista_install_all_dlls( bin )
endif()
# tests
if( ITA_VA_WITH_TESTS OR ITA_VANET_WITH_TESTS )
if( ITA_VA_WITH_TESTS )
set( VANET_COMMON_BUILD TRUE )
add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
endif( ITA_VA_WITH_TESTS OR ITA_VANET_WITH_TESTS )
endif( )
/*
*
* VVV VVV A
* VVV VVV AAA Virtual Acoustics
* VVV VVV AAA Real-time auralisation for virtual reality
* VVV VVV AAA
* VVVVVV AAA (c) Copyright Institut fr Technische Akustik (ITA)
* VVVV AAA RWTH Aachen (http://www.akustik.rwth-aachen.de)
*
* ---------------------------------------------------------------------------------
*
* Datei: VANetServerImpl.h
*
* Zweck: Implementierung des Netzwerk-Servers fr den VA-Kernel
*
* Autor(en): Frank Wefers (Frank.Wefers@akustik.rwth-aachen.de),
* Dominik Rausch (rausch@vr.rwth-aachen.de)
*
* ---------------------------------------------------------------------------------
*/
// $Id: VANetMessage.h 4589 2016-02-24 22:27:08Z stienen $
#ifndef __VANET_MESSAGE_H__
#define __VANET_MESSAGE_H__
......
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