Simplifying cmake configuration

CMakeLists.txt

 cmake_minimum_required( VERSION 2.8 )
 
-#if( NOT VA_COMMON_BUILD )
-
-	project( VAMatlab )
-	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
-	include( VistaCommon )
-	
-#endif()
-
-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 )
-
-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 "Build static VA libs" )
-endif( NOT DEFINED ITA_VA_BUILD_STATIC )
-
-if( NOT DEFINED ITA_VA_MATLAB_INSTALL_WITH_DLLS )
-	set( ITA_VA_MATLAB_INSTALL_WITH_DLLS ON CACHE BOOL "Install VAMatlab with depending DLLs (use with care)" )
-endif( NOT DEFINED ITA_VA_MATLAB_INSTALL_WITH_DLLS )
+project( VAMatlab )
+list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
+include( VistaCommon )
 
 if( NOT DEFINED ITA_VA_MATLAB_BUILD_WITH_INTERNAL_CORE )
 	set( ITA_VA_MATLAB_BUILD_WITH_INTERNAL_CORE OFF CACHE BOOL "Build a VACore into VAMatlab instead of using a network adapter (not recommended)" )
@@ -49,36 +29,30 @@ vista_use_package( NatNetSDK REQUIRED )
 # Compiler
 if( ITA_CORE_LIBS_BUILD_STATIC )
 	add_definitions( -DITA_BASE_STATIC -DITA_DATA_SOURCES_STATIC -DITA_DIFFRACTION_STATIC -DITA_GEO_STATIC -DITA_CONVOLUTION_STATIC -DITA_FFT_STATIC -DITA_CTC_STATIC -DITA_SAMPLER_STATIC )
-endif( ITA_CORE_LIBS_BUILD_STATIC )
+endif( )
 
 if( ITA_VISTA_BUILD_STATIC )
 	add_definitions( -DVISTABASE_STATIC -DVISTAMATH_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAINTERPROCCOMM_STATIC )
-endif( ITA_VISTA_BUILD_STATIC )
+endif( )
 
-if( NOT ITA_VA_BUILD_STATIC )
+if( BUILD_SHARED_LIBS )
 	add_definitions( -DVAMATLAB_EXPORTS )
-else( NOT ITA_VA_BUILD_STATIC )
+else( )
 	add_definitions( -DVABASE_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( )
 
 if( ITA_VA_MATLAB_BUILD_WITH_INTERNAL_CORE )
 	vista_use_package( VACore REQUIRED FIND_DEPENDENCIES )
 	add_definitions( -DVAMATLAB_INTERNAL_CORE )
-endif( ITA_VA_MATLAB_BUILD_WITH_INTERNAL_CORE )
+endif( )
 
 add_definitions( "-DVAMATLAB_VERSION_MAJOR=\"${ITA_VAMATLAB_VERSION_MAJOR}\"" )
 add_definitions( "-DVAMATLAB_VERSION_MINOR=\"${ITA_VAMATLAB_VERSION_MINOR}\"" )
 if( ITA_VAMATLAB_SHOW_BANNER )
 	add_definitions( "-DVAMATLAB_SHOW_BANNER" )
-endif( ITA_VAMATLAB_SHOW_BANNER )
+endif( )
 	
 
-
 # Sources
 set( VAMATLAB_SRC
 	"src/FunctionMappings.h"
@@ -102,12 +76,8 @@ vista_create_cmake_configs( VAMatlab )
 set_property( TARGET VAMatlab PROPERTY FOLDER "VA/Bindings" )
 set_target_properties( VAMatlab PROPERTIES SUFFIX ".${MATLAB_MEX_EXTENSION}")
 
-if( ITA_VA_MATLAB_INSTALL_WITH_DLLS OR ITA_VA_INSTALL_WITH_DLLS )
-	vista_install_all_dlls( bin )
-endif()
-
 
-# VA core configuration file
+# VA matlab scripts file
 set( VAMATLAB_DEPLOY_DIR "${CMAKE_INSTALL_PREFIX}/bin" )
 set( VAMATLAB_SCRIPT_DIR "${CMAKE_INSTALL_PREFIX}/matlab" )
 set( VAMATLAB_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" )