Commit 1d1c0667 authored by Xiaozhong Xu's avatar Xiaozhong Xu Committed by Xiang Li

add back accidentally changed Cmake files

parent ebc88910
...@@ -26,6 +26,11 @@ add_executable( ${EXE_NAME} ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ${CMAKE_CU ...@@ -26,6 +26,11 @@ add_executable( ${EXE_NAME} ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ${CMAKE_CU
# include the output directory, where the svnrevision.h file is generated # include the output directory, where the svnrevision.h file is generated
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
target_compile_definitions( ${EXE_NAME} PUBLIC RExt__DECODER_DEBUG_BIT_STATISTICS=1 ) target_compile_definitions( ${EXE_NAME} PUBLIC RExt__DECODER_DEBUG_BIT_STATISTICS=1 )
target_compile_definitions( ${EXE_NAME} PUBLIC RExt__DECODER_DEBUG_TOOL_STATISTICS=1 )
if( ENABLE_VTM )
target_compile_definitions( ${EXE_NAME} PUBLIC JEM_TOOLS=0 )
endif()
if( SET_ENABLE_TRACING ) if( SET_ENABLE_TRACING )
if( ENABLE_TRACING ) if( ENABLE_TRACING )
...@@ -60,7 +65,7 @@ if( CMAKE_COMPILER_IS_GNUCC AND BUILD_STATIC ) ...@@ -60,7 +65,7 @@ if( CMAKE_COMPILER_IS_GNUCC AND BUILD_STATIC )
target_compile_definitions( ${EXE_NAME} PUBLIC ENABLE_WPP_STATIC_LINK=1 ) target_compile_definitions( ${EXE_NAME} PUBLIC ENABLE_WPP_STATIC_LINK=1 )
endif() endif()
target_link_libraries( ${EXE_NAME} CommonLib DecoderAnalyserLib Utilities Threads::Threads ${ADDITIONAL_LIBS} ) target_link_libraries( ${EXE_NAME} CommonAnalyserLib DecoderAnalyserLib Utilities Threads::Threads ${ADDITIONAL_LIBS} )
# Add a SVN revision generator # Add a SVN revision generator
# a custom target that is always built # a custom target that is always built
......
...@@ -26,6 +26,10 @@ add_executable( ${EXE_NAME} ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ${CMAKE_CU ...@@ -26,6 +26,10 @@ add_executable( ${EXE_NAME} ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ${CMAKE_CU
# include the output directory, where the svnrevision.h file is generated # include the output directory, where the svnrevision.h file is generated
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
if( ENABLE_VTM )
target_compile_definitions( ${EXE_NAME} PUBLIC JEM_TOOLS=0 )
endif()
if( SET_ENABLE_TRACING ) if( SET_ENABLE_TRACING )
if( ENABLE_TRACING ) if( ENABLE_TRACING )
......
...@@ -28,6 +28,10 @@ add_executable( ${EXE_NAME} ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ${CMAKE_CU ...@@ -28,6 +28,10 @@ add_executable( ${EXE_NAME} ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ${CMAKE_CU
# include the output directory, where the svnrevision.h file is generated # include the output directory, where the svnrevision.h file is generated
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
if( ENABLE_VTM )
target_compile_definitions( ${EXE_NAME} PUBLIC JEM_TOOLS=0 )
endif()
if( SET_ENABLE_TRACING ) if( SET_ENABLE_TRACING )
if( ENABLE_TRACING ) if( ENABLE_TRACING )
target_compile_definitions( ${EXE_NAME} PUBLIC ENABLE_TRACING=1 ) target_compile_definitions( ${EXE_NAME} PUBLIC ENABLE_TRACING=1 )
......
...@@ -44,6 +44,10 @@ set( INC_FILES ${BASE_INC_FILES} ${X86_INC_FILES} ${MD5_INC_FILES} ) ...@@ -44,6 +44,10 @@ set( INC_FILES ${BASE_INC_FILES} ${X86_INC_FILES} ${MD5_INC_FILES} )
# library # library
add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ) add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
if( ENABLE_VTM )
target_compile_definitions( ${LIB_NAME} PUBLIC JEM_TOOLS=0 )
endif()
if( EXTENSION_360_VIDEO ) if( EXTENSION_360_VIDEO )
target_compile_definitions( ${LIB_NAME} PUBLIC EXTENSION_360_VIDEO=1 ) target_compile_definitions( ${LIB_NAME} PUBLIC EXTENSION_360_VIDEO=1 )
endif() endif()
......
...@@ -15,6 +15,11 @@ endif() ...@@ -15,6 +15,11 @@ endif()
# library # library
add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ) add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
target_compile_definitions( ${LIB_NAME} PUBLIC RExt__DECODER_DEBUG_BIT_STATISTICS=1 ) target_compile_definitions( ${LIB_NAME} PUBLIC RExt__DECODER_DEBUG_BIT_STATISTICS=1 )
target_compile_definitions( ${LIB_NAME} PUBLIC RExt__DECODER_DEBUG_TOOL_STATISTICS=1 )
if( ENABLE_VTM )
target_compile_definitions( ${LIB_NAME} PUBLIC JEM_TOOLS=0 )
endif()
if( EXTENSION_360_VIDEO ) if( EXTENSION_360_VIDEO )
target_compile_definitions( ${LIB_NAME} PUBLIC EXTENSION_360_VIDEO=1 ) target_compile_definitions( ${LIB_NAME} PUBLIC EXTENSION_360_VIDEO=1 )
...@@ -49,7 +54,7 @@ else() ...@@ -49,7 +54,7 @@ else()
endif() endif()
target_include_directories( ${LIB_NAME} PUBLIC ../DecoderLib ) target_include_directories( ${LIB_NAME} PUBLIC ../DecoderLib )
target_link_libraries( ${LIB_NAME} CommonLib Threads::Threads ) target_link_libraries( ${LIB_NAME} CommonAnalyserLib Threads::Threads )
# example: place header files in different folders # example: place header files in different folders
source_group( "Natvis Files" FILES ${NATVIS_FILES} ) source_group( "Natvis Files" FILES ${NATVIS_FILES} )
......
...@@ -16,6 +16,10 @@ endif() ...@@ -16,6 +16,10 @@ endif()
add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ) add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
target_compile_definitions( ${LIB_NAME} PUBLIC ) target_compile_definitions( ${LIB_NAME} PUBLIC )
if( ENABLE_VTM )
target_compile_definitions( ${LIB_NAME} PUBLIC JEM_TOOLS=0 )
endif()
if( EXTENSION_360_VIDEO ) if( EXTENSION_360_VIDEO )
target_compile_definitions( ${LIB_NAME} PUBLIC EXTENSION_360_VIDEO=1 ) target_compile_definitions( ${LIB_NAME} PUBLIC EXTENSION_360_VIDEO=1 )
endif() endif()
......
...@@ -18,6 +18,10 @@ endif() ...@@ -18,6 +18,10 @@ endif()
add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ) add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
target_compile_definitions( ${LIB_NAME} PUBLIC ) target_compile_definitions( ${LIB_NAME} PUBLIC )
if( ENABLE_VTM )
target_compile_definitions( ${LIB_NAME} PUBLIC JEM_TOOLS=0 )
endif()
if( EXTENSION_360_VIDEO ) if( EXTENSION_360_VIDEO )
target_compile_definitions( ${LIB_NAME} PUBLIC EXTENSION_360_VIDEO=1 ) target_compile_definitions( ${LIB_NAME} PUBLIC EXTENSION_360_VIDEO=1 )
endif() endif()
......
...@@ -16,6 +16,10 @@ endif() ...@@ -16,6 +16,10 @@ endif()
add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ) add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
target_compile_definitions( ${LIB_NAME} PUBLIC ) target_compile_definitions( ${LIB_NAME} PUBLIC )
if( ENABLE_VTM )
target_compile_definitions( ${LIB_NAME} PUBLIC JEM_TOOLS=0 )
endif()
if( EXTENSION_360_VIDEO ) if( EXTENSION_360_VIDEO )
target_compile_definitions( ${LIB_NAME} PUBLIC EXTENSION_360_VIDEO=1 ) target_compile_definitions( ${LIB_NAME} PUBLIC EXTENSION_360_VIDEO=1 )
endif() endif()
......
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