Fixing static linking stuff against vista

CMakeLists.txt

@@ -20,7 +20,7 @@ if( NOT DEFINED ITA_VANET_INSTALL_WITH_DLLS )
 endif( NOT DEFINED ITA_VANET_INSTALL_WITH_DLLS )
 
 
-vista_use_package( VistaCoreLibs REQUIRED COMPONENTS VistaInterProcComm FIND_DEPENDENCIES )
+vista_use_package( VistaCoreLibs REQUIRED COMPONENTS VistaBase VistaInterProcComm FIND_DEPENDENCIES )
 vista_use_package( VABase REQUIRED )
 
 # Including the source files of all source subfolders recursively

tests/VANetTestClient/CMakeLists.txt

@@ -8,13 +8,32 @@ if( NOT VANET_COMMON_BUILD )
 	
 endif()
 
-vista_use_package( VABase REQUIRED FIND_DEPENDENCIES )
+vista_use_package( VANet REQUIRED FIND_DEPENDENCIES )
+vista_use_package( VistaCoreLibs REQUIRED COMPONENTS VistaBase FIND_DEPENDENCIES )
 
-add_definitions( -DVABASE_DLL -DVANET_DLL )
+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_VA_BUILD_STATIC )
+	set( ITA_VA_BUILD_STATIC OFF CACHE BOOL "Link aginst static VA libs" )
+endif( NOT DEFINED ITA_VA_BUILD_STATIC )
+
+# compiler
+if( ITA_VISTA_BUILD_STATIC )
+	add_definitions( -DVISTABASE_STATIC -DVISTAINTERPROCCOMM_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAMATH_STATIC )
+	if( WIN32 )
+		set( VISTAINTERPROCCOMM_ADDITIONAL_DEPENDENCIES Ws2_32 )
+	endif( WIN32 )
+endif( ITA_VISTA_BUILD_STATIC )
+
+if( ITA_VA_BUILD_STATIC )
+	add_definitions( -DVABASE_STATIC -DVACORE_STATIC -DVANET_STATIC )
+endif( ITA_VA_BUILD_STATIC )
 
 
 add_executable( VANetClientTest VANetClientTest.cpp )
-target_link_libraries( VANetClientTest ${VISTA_USE_PACKAGE_LIBRARIES} )
+target_link_libraries( VANetClientTest ${VISTA_USE_PACKAGE_LIBRARIES} ${VISTAINTERPROCCOMM_ADDITIONAL_DEPENDENCIES} )
 
 vista_configure_app( VANetClientTest )
 vista_install( VANetClientTest )