More fixes for CMake config. Removed conversion warning.

7772ff74 · Dipl.-Ing. Jonas Stienen · e902c364 · 7772ff74 · 7772ff74
Commit 7772ff74 authored Jan 06, 2017 by Dipl.-Ing. Jonas Stienen
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

CMakeLists.txt CMakeLists.txt +6 -3

src/ITAHDFTSpectra.cpp src/ITAHDFTSpectra.cpp +1 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,14 +152,16 @@ if( ITA_BASE_WITH_OLD_ATOMICS )
 endif()

 if( ITA_BASE_WITH_OLD_RAVEN_OPS )
+	if( NOT ITA_BASE_WITH_CONFIG_OLD_IMPL )
+		message( FATAL_ERROR "ITABase old RAVEN ops requires regular expressions and old config implementation. Please activate." )
+	endif()
 	set( ITABaseHeader "${ITABaseHeader}" "include/ITAOps.h" )
 	set( ITABaseSources "${ITABaseSources}" "src/ITAOps.cpp" )
 endif()

 if( VPCRE_FOUND AND ITA_BASE_WITH_REGULAR_EXPRESSIONS )
 	add_definitions( -DPCRE_STATIC )
-	list( APPEND ITABaseHeader "include/ITAConfigUtils.h" )
-	list( APPEND ITABaseSources "src/ITAStringUtilsPCRE.cpp" "src/ITAConfigUtils.cpp" )
+	list( APPEND ITABaseSources "src/ITAStringUtilsPCRE.cpp" )
 else()
 	list( APPEND ITABaseSources "src/ITAStringUtils.cpp" )
 endif()
@@ -170,7 +172,8 @@ if( ITA_BASE_WITH_CONFIG_OLD_IMPL AND NOT ITA_BASE_WITH_CONFIG_SIMPLE_INI )
 	if( NOT ITA_BASE_WITH_REGULAR_EXPRESSIONS )
 		message( FATAL_ERROR "ITABase old config implementation requires regular expressions. Please activate." )
 	endif()
-	list( APPEND ITABaseSources "src/ITAConfigUtilsWin32Impl.cpp" )
+	list( APPEND ITABaseHeader "include/ITAConfigUtils.h" )
+	list( APPEND ITABaseSources "src/ITAConfigUtils.cpp" "src/ITAConfigUtilsWin32Impl.cpp" )
 endif()



--- a/src/ITAHDFTSpectra.cpp
+++ b/src/ITAHDFTSpectra.cpp
@@ -52,7 +52,7 @@ float ITAHDFTSpectra::GetMaxEnergy( int* piIdx ) const
 		if (fEnergyTemp > fEnergyMax)
 		{
 			fEnergyMax = fEnergyTemp;
-			*piIdx = n;
+			*piIdx = int( n );
 		}
 	}