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

Merge branch 'develop'

parents 3ba6515b 4559bc5c
......@@ -12,18 +12,6 @@ vista_use_package( VABase REQUIRED FIND_DEPENDENCIES )
vista_use_package( Lua REQUIRED )
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_VALUA_INSTALL_WITH_DLLS )
set( ITA_VALUA_INSTALL_WITH_DLLS ON CACHE BOOL "Install VALua with depending DLLs (use this switch with care)" )
endif( NOT DEFINED ITA_VALUA_INSTALL_WITH_DLLS )
# includes
include_directories( "include" )
......@@ -33,16 +21,11 @@ include( "include/_SourceFiles.cmake" )
include( "src/_SourceFiles.cmake" )
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( )
# linker
......@@ -58,7 +41,3 @@ vista_create_cmake_configs( VALua )
vista_create_default_info_file( VALua )
set_property( TARGET VALua PROPERTY FOLDER "VA/Bindings" )
if( ITA_VALUA_INSTALL_WITH_DLLS OR ITA_VA_INSTALL_WITH_DLLS )
vista_install_all_dlls( bin )
endif()
Supports Markdown
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