Skip to content
Snippets Groups Projects
Commit 004ba6ef authored by Karsten Suehring's avatar Karsten Suehring
Browse files

Use a single CMake variable instead of two

parent 4ffa59a8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 18 additions and 17 deletions
CMakeLists.txt
+ 3
− 2
View file @ 004ba6ef
......@@ -33,8 +33,9 @@ set( EXTENSION_HDRTOOLS OFF CACHE BOOL "If EXTENSION_HDRTOOLS is on, HDRLib will
if (DEFINED ENABLE_TRACING)
set( ENABLE_TRACING OFF CACHE BOOL "ENABLE_TRACING will be set to this value" )
endif()
set( SET_ENABLE_HIGH_BITDEPTH OFF CACHE BOOL "Set RExt__HIGH_BIT_DEPTH_SUPPORT as a compiler flag" )
set( ENABLE_HIGH_BITDEPTH OFF CACHE BOOL "If SET_ENABLE_HIGH_BITDEPTH is on, it will be set to this value" )
if (DEFINED ENABLE_HIGH_BITDEPTH)
set( ENABLE_HIGH_BITDEPTH OFF CACHE BOOL "ENABLE_HIGH_BITDEPTH will be set to this value" )
endif()
if( CMAKE_COMPILER_IS_GNUCC )
set( BUILD_STATIC OFF CACHE BOOL "Build static executables" )
......
Makefile
+ 1
− 1
View file @ 004ba6ef
......@@ -87,7 +87,7 @@ CONFIG_OPTIONS += -DENABLE_TRACING=$(enable-tracing)
endif
ifneq ($(high-bitdepth),)
CONFIG_OPTIONS += -DSET_ENABLE_HIGH_BITDEPTH=ON -DENABLE_HIGH_BITDEPTH=$(high-bitdepth)
CONFIG_OPTIONS += -DENABLE_HIGH_BITDEPTH=$(high-bitdepth)
endif
ifneq ($(static),)
......
source/App/BitstreamExtractorApp/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -33,7 +33,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${EXE_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/App/DecoderAnalyserApp/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -35,7 +35,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${EXE_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/App/DecoderApp/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -33,7 +33,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${EXE_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/App/EncoderApp/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -35,7 +35,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${EXE_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/App/SEIFilmGrainApp/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -33,7 +33,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${EXE_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/App/SEIRemovalApp/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -33,7 +33,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${EXE_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/App/StreamMergeApp/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -33,7 +33,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${EXE_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/App/SubpicMergeApp/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -33,7 +33,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${EXE_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/Lib/CommonAnalyserLib/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -65,7 +65,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${LIB_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/Lib/CommonLib/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -63,7 +63,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${LIB_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/Lib/DecoderAnalyserLib/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -29,7 +29,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${LIB_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/Lib/DecoderLib/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -28,7 +28,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${LIB_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/Lib/EncoderLib/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -32,7 +32,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${LIB_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
source/Lib/Utilities/CMakeLists.txt
+ 1
− 1
View file @ 004ba6ef
......@@ -28,7 +28,7 @@ if( DEFINED ENABLE_TRACING )
endif()
endif()
if( SET_ENABLE_HIGH_BITDEPTH )
if( DEFINED ENABLE_HIGH_BITDEPTH )
if( ENABLE_HIGH_BITDEPTH )
target_compile_definitions( ${LIB_NAME} PUBLIC RExt__HIGH_BIT_DEPTH_SUPPORT=1 )
else()
......
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