cleaing up cmake configs

9bbca6aa · Dipl.-Ing. Jonas Stienen · 18468f8f · 9bbca6aa
Commit 9bbca6aa authored Jan 10, 2017 by Dipl.-Ing. Jonas Stienen
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 9 deletions

tests/CMakeLists.txt tests/CMakeLists.txt +5 -9

No files found.
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
 cmake_minimum_required( VERSION 2.8 )

-if( NOT ITACONVOLUTION_COMMON_BUILD )
-
-	project( ITAConvolutionTests )
-	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
-	include( VistaCommon )
-	
-endif()
+project( ITAConvolutionTests )
+list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
+include( VistaCommon )

 vista_use_package( ITAConvolution REQUIRED FIND_DEPENDENCIES )

-if( NOT ITA_CORE_LIBS_BUILD_STATIC AND NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC )
+if( NOT ITA_CORE_LIBS_BUILD_STATIC )
 	add_definitions( -DITA_BASE_STATIC -DITA_FFT_STATIC -DITA_CONVOLUTION_STATIC )
-endif( NOT ITA_CORE_LIBS_BUILD_STATIC AND NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC )
+endif( )

 add_executable( ITAConvolutionTest "ITAConvolutionTest.cpp" )
 target_link_libraries( ITAConvolutionTest ${VISTA_USE_PACKAGE_LIBRARIES} )