Adding config setting for ITAOps with legacy code for RAVEN

parent c78b1c8b
...@@ -25,17 +25,21 @@ if( NOT DEFINED ITA_BASE_WITH_SNDFILE ) ...@@ -25,17 +25,21 @@ if( NOT DEFINED ITA_BASE_WITH_SNDFILE )
endif( NOT DEFINED ITA_BASE_WITH_SNDFILE ) endif( NOT DEFINED ITA_BASE_WITH_SNDFILE )
if( NOT DEFINED ITA_BASE_WITH_OLD_ATOMICS ) if( NOT DEFINED ITA_BASE_WITH_OLD_ATOMICS )
set( ITA_BASE_WITH_OLD_ATOMICS OFF CACHE BOOL "Build with legacy atomic code for non-C++11 compatible compilers" ) set( ITA_BASE_WITH_OLD_ATOMICS OFF CACHE BOOL "Build with old atomic code for non-C++11 compatible compilers" )
endif( NOT DEFINED ITA_BASE_WITH_OLD_ATOMICS ) endif( NOT DEFINED ITA_BASE_WITH_OLD_ATOMICS )
if( NOT DEFINED ITA_BASE_WITH_REGULAR_EXPRESSIONS ) if( NOT DEFINED ITA_BASE_WITH_REGULAR_EXPRESSIONS )
set( ITA_BASE_WITH_REGULAR_EXPRESSIONS OFF CACHE BOOL "Build with legacy regular expressions code for string manipulation" ) set( ITA_BASE_WITH_REGULAR_EXPRESSIONS OFF CACHE BOOL "Build with old regular expressions code for string manipulation" )
endif( NOT DEFINED ITA_BASE_WITH_REGULAR_EXPRESSIONS ) endif( NOT DEFINED ITA_BASE_WITH_REGULAR_EXPRESSIONS )
if( NOT DEFINED ITA_BASE_WITH_CONFIG_OLD_IMPL ) if( NOT DEFINED ITA_BASE_WITH_CONFIG_OLD_IMPL )
set( ITA_BASE_WITH_CONFIG_OLD_IMPL OFF CACHE BOOL "Build with legacy INI file configuration implementation (uses legacy regular expressions)" ) set( ITA_BASE_WITH_CONFIG_OLD_IMPL OFF CACHE BOOL "Build with old INI file configuration implementation (uses legacy regular expressions)" )
endif( NOT DEFINED ITA_BASE_WITH_CONFIG_OLD_IMPL ) endif( NOT DEFINED ITA_BASE_WITH_CONFIG_OLD_IMPL )
if( NOT DEFINED ITA_BASE_WITH_OLD_RAVEN_OPS )
set( ITA_BASE_WITH_OLD_RAVEN_OPS OFF CACHE BOOL "Build with old ITAOps helper functions implementation (legacy code for RAVEN compatibility)" )
endif( NOT DEFINED ITA_BASE_WITH_OLD_RAVEN_OPS )
# includes # includes
include_directories( "include" ) include_directories( "include" )
...@@ -63,7 +67,6 @@ set( ITABaseHeader ...@@ -63,7 +67,6 @@ set( ITABaseHeader
"include/ITALog.h" "include/ITALog.h"
"include/ITAMutex.h" "include/ITAMutex.h"
"include/ITANumericUtils.h" "include/ITANumericUtils.h"
"include/ITAOps.h"
"include/ITASampleBuffer.h" "include/ITASampleBuffer.h"
"include/ITASampleFrame.h" "include/ITASampleFrame.h"
"include/ITASampleTypeConversion.h" "include/ITASampleTypeConversion.h"
...@@ -96,7 +99,6 @@ set( ITABaseSources ...@@ -96,7 +99,6 @@ set( ITABaseSources
"src/ITALog.cpp" "src/ITALog.cpp"
"src/ITAMutex.cpp" "src/ITAMutex.cpp"
"src/ITANumericUtils.cpp" "src/ITANumericUtils.cpp"
"src/ITAOps.cpp"
"src/ITASampleBuffer.cpp" "src/ITASampleBuffer.cpp"
"src/ITASampleFrame.cpp" "src/ITASampleFrame.cpp"
"src/ITASampleTypeConversion.cpp" "src/ITASampleTypeConversion.cpp"
...@@ -132,7 +134,7 @@ else( VIPP_FOUND AND ITA_BASE_WITH_FASTMATH_IPP ) ...@@ -132,7 +134,7 @@ else( VIPP_FOUND AND ITA_BASE_WITH_FASTMATH_IPP )
endif( VIPP_FOUND AND ITA_BASE_WITH_FASTMATH_IPP ) endif( VIPP_FOUND AND ITA_BASE_WITH_FASTMATH_IPP )
if( ITA_BASE_WITH_OLD_ATOMICS ) if( ITA_BASE_WITH_OLD_ATOMICS )
set( ITABaseHeader "${ITABaseHeader}" "include/ITAAtomicOps.h" "include/ITAAtomicPrimitives.h") set( ITABaseHeader "${ITABaseHeader}" "include/ITAAtomicOps.h" "include/ITAAtomicPrimitives.h" )
if( WIN32 ) if( WIN32 )
set( ITABaseSources "${ITABaseSources}" "src/ITAAtomicOpsWin32Impl.cpp" ) set( ITABaseSources "${ITABaseSources}" "src/ITAAtomicOpsWin32Impl.cpp" )
else( WIN32 ) else( WIN32 )
...@@ -140,6 +142,11 @@ if( ITA_BASE_WITH_OLD_ATOMICS ) ...@@ -140,6 +142,11 @@ if( ITA_BASE_WITH_OLD_ATOMICS )
endif( WIN32 ) endif( WIN32 )
endif( ITA_BASE_WITH_OLD_ATOMICS ) endif( ITA_BASE_WITH_OLD_ATOMICS )
if( ITA_BASE_WITH_OLD_RAVEN_OPS )
set( ITABaseHeader "${ITABaseHeader}" "include/ITAOps.h" )
set( ITABaseSources "${ITABaseSources}" "src/ITAOps.cpp" )
endif( ITA_BASE_WITH_OLD_RAVEN_OPS )
if( VPCRE_FOUND AND ITA_BASE_WITH_REGULAR_EXPRESSIONS ) if( VPCRE_FOUND AND ITA_BASE_WITH_REGULAR_EXPRESSIONS )
list( APPEND ITABaseHeader "include/ITAConfigUtils.h" ) list( APPEND ITABaseHeader "include/ITAConfigUtils.h" )
list( APPEND ITABaseSources "src/ITAConfigUtils.cpp" "src/ITAStringUtilsPCRE.cpp" ) list( APPEND ITABaseSources "src/ITAConfigUtils.cpp" "src/ITAStringUtilsPCRE.cpp" )
......
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