Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
VVCSoftware_BMS
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Custom Issue Tracker
Custom Issue Tracker
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jvet
VVCSoftware_BMS
Commits
daf0108a
Commit
daf0108a
authored
Sep 20, 2018
by
Frank Bossen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'noSVN-fix' into 'master'
remove SVN detection See merge request
!113
parents
44bd4993
5a5fe16d
Pipeline
#117
passed with stage
Changes
9
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
4 additions
and
79 deletions
+4
-79
CMakeLists.txt
CMakeLists.txt
+0
-1
Makefile
Makefile
+0
-4
source/App/DecoderAnalyserApp/CMakeLists.txt
source/App/DecoderAnalyserApp/CMakeLists.txt
+1
-14
source/App/DecoderApp/CMakeLists.txt
source/App/DecoderApp/CMakeLists.txt
+1
-14
source/App/DecoderApp/decmain.cpp
source/App/DecoderApp/decmain.cpp
+0
-6
source/App/EncoderApp/CMakeLists.txt
source/App/EncoderApp/CMakeLists.txt
+1
-14
source/App/EncoderApp/encmain.cpp
source/App/EncoderApp/encmain.cpp
+0
-6
source/App/SEIRemovalApp/CMakeLists.txt
source/App/SEIRemovalApp/CMakeLists.txt
+1
-14
source/App/SEIRemovalApp/seiremovalmain.cpp
source/App/SEIRemovalApp/seiremovalmain.cpp
+0
-6
No files found.
CMakeLists.txt
View file @
daf0108a
...
...
@@ -28,7 +28,6 @@ if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
endif
()
set
(
EXTENSION_360_VIDEO OFF CACHE BOOL
"If EXTENSION_360_VIDEO is on, 360Lib will be added"
)
set
(
SKIP_SVN_REVISION OFF CACHE BOOL
"Don't add SVN path and revision info to the encoder and decoder output"
)
set
(
SET_ENABLE_TRACING OFF CACHE BOOL
"Set ENABLE_TRACING as a compiler flag"
)
set
(
ENABLE_TRACING OFF CACHE BOOL
"If SET_ENABLE_TRACING is on, it will be set to this value"
)
set
(
ENABLE_VTM OFF CACHE BOOL
"If ENABLE_VTM is on, the software will be compiled as VTM"
)
...
...
Makefile
View file @
daf0108a
...
...
@@ -71,10 +71,6 @@ ifneq ($(enable-tracing),)
CONFIG_OPTIONS
+=
-DSET_ENABLE_TRACING
=
ON
-DENABLE_TRACING
=
$
(
enable-tracing
)
endif
ifneq
($(skip-svn-info),)
CONFIG_OPTIONS
+=
-DSKIP_SVN_REVISION
=
$
(
skip-svn-info
)
endif
ifneq
($(parallel-split),)
CONFIG_OPTIONS
+=
-DSET_ENABLE_SPLIT_PARALLELISM
=
ON
-DENABLE_SPLIT_PARALLELISM
=
$
(
parallel-split
)
endif
...
...
source/App/DecoderAnalyserApp/CMakeLists.txt
View file @
daf0108a
...
...
@@ -22,8 +22,7 @@ if( MSVC )
endif
()
# add executable
add_executable
(
${
EXE_NAME
}
${
SRC_FILES
}
${
INC_FILES
}
${
NATVIS_FILES
}
${
CMAKE_CURRENT_BINARY_DIR
}
/svnheader.h
)
# include the output directory, where the svnrevision.h file is generated
add_executable
(
${
EXE_NAME
}
${
SRC_FILES
}
${
INC_FILES
}
${
NATVIS_FILES
}
)
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_TOOL_STATISTICS=1
)
...
...
@@ -67,17 +66,6 @@ endif()
target_link_libraries
(
${
EXE_NAME
}
CommonAnalyserLib DecoderAnalyserLib Utilities Threads::Threads
${
ADDITIONAL_LIBS
}
)
# Add a SVN revision generator
# a custom target that is always built
add_custom_target
(
DecAnalyserSvnHeader ALL DEPENDS
${
CMAKE_CURRENT_BINARY_DIR
}
/svnheader.h
)
# creates svnrevision.h using cmake script
add_custom_command
(
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/svnheader.h COMMAND
${
CMAKE_COMMAND
}
-DSOURCE_DIR=
${
CMAKE_SOURCE_DIR
}
-DGENERATE_DUMMY=
${
SKIP_SVN_REVISION
}
-P
${
CMAKE_SOURCE_DIR
}
/cmake/modules/GetSVN.cmake
)
# svnrevision.h is a generated file
set_source_files_properties
(
${
CMAKE_CURRENT_BINARY_DIR
}
/svnrevision.h PROPERTIES GENERATED TRUE HEADER_FILE_ONLY TRUE
)
# explicitly say that the executable depends on the EncSvnHeader
add_dependencies
(
${
EXE_NAME
}
DecAnalyserSvnHeader
)
# lldb custom data formatters
if
(
XCODE
)
add_dependencies
(
${
EXE_NAME
}
Install
${
PROJECT_NAME
}
LldbFiles
)
...
...
@@ -100,4 +88,3 @@ source_group( "Natvis Files" FILES ${NATVIS_FILES} )
# set the folder where to place the projects
set_target_properties
(
${
EXE_NAME
}
PROPERTIES FOLDER app LINKER_LANGUAGE CXX
)
set_target_properties
(
DecAnalyserSvnHeader PROPERTIES FOLDER svn
)
source/App/DecoderApp/CMakeLists.txt
View file @
daf0108a
...
...
@@ -22,8 +22,7 @@ if( MSVC )
endif
()
# add executable
add_executable
(
${
EXE_NAME
}
${
SRC_FILES
}
${
INC_FILES
}
${
NATVIS_FILES
}
${
CMAKE_CURRENT_BINARY_DIR
}
/svnheader.h
)
# include the output directory, where the svnrevision.h file is generated
add_executable
(
${
EXE_NAME
}
${
SRC_FILES
}
${
INC_FILES
}
${
NATVIS_FILES
}
)
include_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
)
if
(
ENABLE_VTM
)
...
...
@@ -66,17 +65,6 @@ endif()
target_link_libraries
(
${
EXE_NAME
}
CommonLib DecoderLib Utilities Threads::Threads
${
ADDITIONAL_LIBS
}
)
# Add a SVN revision generator
# a custom target that is always built
add_custom_target
(
DecSvnHeader ALL DEPENDS
${
CMAKE_CURRENT_BINARY_DIR
}
/svnheader.h
)
# creates svnrevision.h using cmake script
add_custom_command
(
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/svnheader.h COMMAND
${
CMAKE_COMMAND
}
-DSOURCE_DIR=
${
CMAKE_SOURCE_DIR
}
-DGENERATE_DUMMY=
${
SKIP_SVN_REVISION
}
-P
${
CMAKE_SOURCE_DIR
}
/cmake/modules/GetSVN.cmake
)
# svnrevision.h is a generated file
set_source_files_properties
(
${
CMAKE_CURRENT_BINARY_DIR
}
/svnrevision.h PROPERTIES GENERATED TRUE HEADER_FILE_ONLY TRUE
)
# explicitly say that the executable depends on the EncSvnHeader
add_dependencies
(
${
EXE_NAME
}
DecSvnHeader
)
# lldb custom data formatters
if
(
XCODE
)
add_dependencies
(
${
EXE_NAME
}
Install
${
PROJECT_NAME
}
LldbFiles
)
...
...
@@ -99,4 +87,3 @@ source_group( "Natvis Files" FILES ${NATVIS_FILES} )
# set the folder where to place the projects
set_target_properties
(
${
EXE_NAME
}
PROPERTIES FOLDER app LINKER_LANGUAGE CXX
)
set_target_properties
(
DecSvnHeader PROPERTIES FOLDER svn
)
source/App/DecoderApp/decmain.cpp
View file @
daf0108a
...
...
@@ -41,8 +41,6 @@
#include "DecApp.h"
#include "program_options_lite.h"
#include "svnrevision.h"
//! \ingroup DecoderApp
//! \{
...
...
@@ -56,11 +54,7 @@ int main(int argc, char* argv[])
// print information
fprintf
(
stdout
,
"
\n
"
);
#ifdef SVNREVISION
fprintf
(
stdout
,
"VVCSoftware: BMS Decoder Version %s (%s@r%s) "
,
NEXT_SOFTWARE_VERSION
,
SVNRELATIVEURL
,
SVNREVISION
/*NV_VERSION*/
);
#else
fprintf
(
stdout
,
"VVCSoftware: BMS Decoder Version %s "
,
NEXT_SOFTWARE_VERSION
/*NV_VERSION*/
);
#endif
fprintf
(
stdout
,
NVM_ONOS
);
fprintf
(
stdout
,
NVM_COMPILEDBY
);
fprintf
(
stdout
,
NVM_BITS
);
...
...
source/App/EncoderApp/CMakeLists.txt
View file @
daf0108a
...
...
@@ -24,8 +24,7 @@ if( MSVC )
endif
()
# add executable
add_executable
(
${
EXE_NAME
}
${
SRC_FILES
}
${
INC_FILES
}
${
NATVIS_FILES
}
${
CMAKE_CURRENT_BINARY_DIR
}
/svnheader.h
)
# include the output directory, where the svnrevision.h file is generated
add_executable
(
${
EXE_NAME
}
${
SRC_FILES
}
${
INC_FILES
}
${
NATVIS_FILES
}
)
include_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
)
if
(
ENABLE_VTM
)
...
...
@@ -71,17 +70,6 @@ if( EXTENSION_360_VIDEO )
target_link_libraries
(
${
EXE_NAME
}
Lib360 AppEncHelper360
)
endif
()
# Add a SVN revision generator
# a custom target that is always built
add_custom_target
(
EncSvnHeader ALL DEPENDS
${
CMAKE_CURRENT_BINARY_DIR
}
/svnheader.h
)
# creates svnrevision.h using cmake script
add_custom_command
(
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/svnheader.h COMMAND
${
CMAKE_COMMAND
}
-DSOURCE_DIR=
${
CMAKE_SOURCE_DIR
}
-DGENERATE_DUMMY=
${
SKIP_SVN_REVISION
}
-P
${
CMAKE_SOURCE_DIR
}
/cmake/modules/GetSVN.cmake
)
# svnrevision.h is a generated file
set_source_files_properties
(
${
CMAKE_CURRENT_BINARY_DIR
}
/svnrevision.h PROPERTIES GENERATED TRUE HEADER_FILE_ONLY TRUE
)
# explicitly say that the executable depends on the EncSvnHeader
add_dependencies
(
${
EXE_NAME
}
EncSvnHeader
)
# lldb custom data formatters
if
(
XCODE
)
add_dependencies
(
${
EXE_NAME
}
Install
${
PROJECT_NAME
}
LldbFiles
)
...
...
@@ -104,5 +92,4 @@ source_group( "Natvis Files" FILES ${NATVIS_FILES} )
# set the folder where to place the projects
set_target_properties
(
${
EXE_NAME
}
PROPERTIES FOLDER app LINKER_LANGUAGE CXX
)
set_target_properties
(
EncSvnHeader PROPERTIES FOLDER svn
)
source/App/EncoderApp/encmain.cpp
View file @
daf0108a
...
...
@@ -43,8 +43,6 @@
#include "EncApp.h"
#include "Utilities/program_options_lite.h"
#include "svnrevision.h"
//! \ingroup EncoderApp
//! \{
...
...
@@ -86,11 +84,7 @@ int main(int argc, char* argv[])
{
// print information
fprintf
(
stdout
,
"
\n
"
);
#ifdef SVNREVISION
fprintf
(
stdout
,
"VVCSoftware: BMS Encoder Version %s (%s@r%s) "
,
NEXT_SOFTWARE_VERSION
,
SVNRELATIVEURL
,
SVNREVISION
/*NV_VERSION*/
);
#else
fprintf
(
stdout
,
"VVCSoftware: BMS Encoder Version %s "
,
NEXT_SOFTWARE_VERSION
/*NV_VERSION*/
);
#endif
fprintf
(
stdout
,
NVM_ONOS
);
fprintf
(
stdout
,
NVM_COMPILEDBY
);
fprintf
(
stdout
,
NVM_BITS
);
...
...
source/App/SEIRemovalApp/CMakeLists.txt
View file @
daf0108a
...
...
@@ -22,8 +22,7 @@ if( MSVC )
endif
()
# add executable
add_executable
(
${
EXE_NAME
}
${
SRC_FILES
}
${
INC_FILES
}
${
NATVIS_FILES
}
${
CMAKE_CURRENT_BINARY_DIR
}
/svnheader.h
)
# include the output directory, where the svnrevision.h file is generated
add_executable
(
${
EXE_NAME
}
${
SRC_FILES
}
${
INC_FILES
}
${
NATVIS_FILES
}
)
include_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
)
if
(
SET_ENABLE_TRACING
)
...
...
@@ -61,17 +60,6 @@ endif()
target_link_libraries
(
${
EXE_NAME
}
CommonLib DecoderLib Utilities Threads::Threads
${
ADDITIONAL_LIBS
}
)
# Add a SVN revision generator
# a custom target that is always built
add_custom_target
(
SeiRemovalSvnHeader ALL DEPENDS
${
CMAKE_CURRENT_BINARY_DIR
}
/svnheader.h
)
# creates svnrevision.h using cmake script
add_custom_command
(
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/svnheader.h COMMAND
${
CMAKE_COMMAND
}
-DSOURCE_DIR=
${
CMAKE_SOURCE_DIR
}
-DGENERATE_DUMMY=
${
SKIP_SVN_REVISION
}
-P
${
CMAKE_SOURCE_DIR
}
/cmake/modules/GetSVN.cmake
)
# svnrevision.h is a generated file
set_source_files_properties
(
${
CMAKE_CURRENT_BINARY_DIR
}
/svnrevision.h PROPERTIES GENERATED TRUE HEADER_FILE_ONLY TRUE
)
# explicitly say that the executable depends on the EncSvnHeader
add_dependencies
(
${
EXE_NAME
}
SeiRemovalSvnHeader
)
# lldb custom data formatters
if
(
XCODE
)
add_dependencies
(
${
EXE_NAME
}
Install
${
PROJECT_NAME
}
LldbFiles
)
...
...
@@ -94,4 +82,3 @@ source_group( "Natvis Files" FILES ${NATVIS_FILES} )
# set the folder where to place the projects
set_target_properties
(
${
EXE_NAME
}
PROPERTIES FOLDER app LINKER_LANGUAGE CXX
)
set_target_properties
(
SeiRemovalSvnHeader PROPERTIES FOLDER svn
)
source/App/SEIRemovalApp/seiremovalmain.cpp
View file @
daf0108a
...
...
@@ -41,8 +41,6 @@
#include "SEIRemovalApp.h"
#include "program_options_lite.h"
#include "svnrevision.h"
//! \ingroup DecoderApp
//! \{
...
...
@@ -56,11 +54,7 @@ int main(int argc, char* argv[])
// print information
fprintf
(
stdout
,
"
\n
"
);
#ifdef SVNREVISION
fprintf
(
stdout
,
"VVCSoftware: BMS Decoder Version %s (%s@r%s) "
,
NEXT_SOFTWARE_VERSION
,
SVNRELATIVEURL
,
SVNREVISION
/*NV_VERSION*/
);
#else
fprintf
(
stdout
,
"VVCSoftware: BMS Decoder Version %s "
,
NEXT_SOFTWARE_VERSION
/*NV_VERSION*/
);
#endif
fprintf
(
stdout
,
NVM_ONOS
);
fprintf
(
stdout
,
NVM_COMPILEDBY
);
fprintf
(
stdout
,
NVM_BITS
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment