Merge branch 'NCS-1.0_candidate_CI_correction' into 'NCS-1.0_candidate'

change CI target branch

See merge request jvet-ahg-nnvc/VVCSoftware_VTM!13

.gitlab-ci.yml

 stages:
    - build
 variables:
-      GIT_SUBMODULE_STRATEGY: normal
+      GIT_SUBMODULE_STRATEGY: none
 
 .build_template:
    stage: build
    script:
+      - make sadlclean
       - make realclean
       - make all
    only:
@@ -13,13 +14,14 @@ variables:
          - master
          - merge_requests
       variables:
-         - $CI_PROJECT_URL == 'https://vcgit.hhi.fraunhofer.de/jvet/VVCSoftware_VTM'
-         - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'master'
+         - $CI_PROJECT_URL == 'https://vcgit.hhi.fraunhofer.de/jvet-ahg-nnvc/VVCSoftware_VTM'
+         - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'NCS-1.0_candidate'
          
 
 .build_template_linux:
    extends: .build_template
    script:
+      - make sadlclean
       - make realclean
       - make all
       - make realclean
@@ -30,10 +32,10 @@ build_macos:
    tags:
       - macos
 
-build_ubuntu1604:
-   extends: .build_template_linux
-   tags:
-      - ubuntu1604
+#build_ubuntu1604:
+#   extends: .build_template_linux
+#   tags:
+#      - ubuntu1604
 
 build_ubuntu1804:
    extends: .build_template_linux
@@ -43,6 +45,7 @@ build_ubuntu1804:
 build_ubuntu1804-gcc8:
    extends: .build_template_linux
    script:
+      - make sadlclean
       - make realclean
       - make all toolset=gcc-8
       - make realclean
@@ -50,6 +53,11 @@ build_ubuntu1804-gcc8:
    tags:
       - ubuntu1804-gcc8
 
+build_ubuntu2004:
+   extends: .build_template_linux
+   tags:
+      - ubuntu2004
+
 build_vc191x:
    extends: .build_template
    tags:

CMakeLists.txt

@@ -43,7 +43,9 @@ endif()
 # set c++14
 set( CMAKE_CXX_STANDARD 14 )
 set( CMAKE_CXX_STANDARD_REQUIRED ON )
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math -Wall -fstrict-aliasing" )
+if( UNIX OR MINGW )
+  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math -Wall -fstrict-aliasing" )
+endif()
 
 # compile everything position independent (even static libraries)
 set( CMAKE_POSITION_INDEPENDENT_CODE TRUE )

Makefile

@@ -177,4 +177,8 @@ $(TARGETS_RELWITHDEBINFO_CLEAN_FIRST):
 realclean:
 	$(RM) -rf bin build lib
 
+sadlclean:
+	$(RM) -rf sadl
+	git clone https://mpeg:${MPEGPWD}@vcgit.hhi.fraunhofer.de/jvet-ahg-nnvc/sadl.git sadl
+
 .NOTPARALLEL: