More fixes for CMake config. Removed conversion warning.

parent e902c364
......@@ -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()
......
......@@ -52,7 +52,7 @@ float ITAHDFTSpectra::GetMaxEnergy( int* piIdx ) const
if (fEnergyTemp > fEnergyMax)
{
fEnergyMax = fEnergyTemp;
*piIdx = n;
*piIdx = int( n );
}
}
......
Markdown is supported
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