[x265] [PATCH] cmake: restore order of options changed by commit d00f2f5 (important for GCC < 6)

[Mateusz Brzostek]

For GCC 5.4, 4.9 and 4.8 option '-std=gnu++11' must be more in front of rest of options.
Sorry that I didn't check this earlier.

I propose to move 'option(ENABLE_DYNAMIC_HDR10 ...' before we check if ENABLE_DYNAMIC_HDR10 is ON -- now it is not important, but in the future it might be ON by default, so we will be ready.

Please review.

# HG changeset patch
# User Ma0 <mateuszb at poczta.onet.pl>
# Date 1494020993 -7200
#      Fri May 05 23:49:53 2017 +0200
# Node ID 773050491507885eb5658be01fe8ee85deec4d54
# Parent  fd01abfc7898283922b34f7fcd9192ddf9c7818a
cmake: restore order of options changed by commit d00f2f5 (important for GCC < 6)

diff -r fd01abfc7898 -r 773050491507 source/CMakeLists.txt
--- a/source/CMakeLists.txt    Tue May 02 14:09:48 2017 -0700
+++ b/source/CMakeLists.txt    Fri May 05 23:49:53 2017 +0200
@@ -183,10 +183,17 @@
     add_definitions(-qinline=level=10 -qpath=IL:/data/video_files/latest.tpo/)
 endif()
 
+# this option is to enable the inclusion of dynamic HDR10 library to the libx265 compilation
+option(ENABLE_DYNAMIC_HDR10 "Enable dynamic HDR10 compilation" OFF)
 
 if(GCC)
     add_definitions(-Wall -Wextra -Wshadow)
     add_definitions(-D__STDC_LIMIT_MACROS=1)
+    if(ENABLE_DYNAMIC_HDR10)
+        add_definitions(-std=gnu++11)
+    else()
+        add_definitions(-std=gnu++98)
+    endif()
     if(ENABLE_PIC)
          add_definitions(-fPIC)
     endif(ENABLE_PIC)
@@ -362,20 +369,12 @@
 else(HIGH_BIT_DEPTH)
     add_definitions(-DHIGH_BIT_DEPTH=0 -DX265_DEPTH=8)
 endif(HIGH_BIT_DEPTH)
-# this option is to enable the inclusion of dynamic HDR10 library to the libx265 compilation
-option(ENABLE_DYNAMIC_HDR10 "Enable dynamic HDR10 compilation" OFF)
+
 if (ENABLE_DYNAMIC_HDR10)
     add_subdirectory(dynamicHDR10)
     include_directories(dynamicHDR10)
     add_definitions(-DENABLE_DYNAMIC_HDR10)
 endif(ENABLE_DYNAMIC_HDR10)
-if(GCC)
-    if(ENABLE_DYNAMIC_HDR10)
-        add_definitions(-std=gnu++11)
-    else()
-        add_definitions(-std=gnu++98)
-    endif()
-endif(GCC)
 
 # this option can only be used when linking multiple libx265 libraries
 # together, and some alternate API access method is implemented.

-------------- next part --------------
# HG changeset patch
# User Ma0 <mateuszb at poczta.onet.pl>
# Date 1494020993 -7200
#      Fri May 05 23:49:53 2017 +0200
# Node ID 773050491507885eb5658be01fe8ee85deec4d54
# Parent  fd01abfc7898283922b34f7fcd9192ddf9c7818a
cmake: restore order of options changed by commit d00f2f5 (important for GCC < 6)

diff -r fd01abfc7898 -r 773050491507 source/CMakeLists.txt
--- a/source/CMakeLists.txt	Tue May 02 14:09:48 2017 -0700
+++ b/source/CMakeLists.txt	Fri May 05 23:49:53 2017 +0200
@@ -183,10 +183,17 @@
     add_definitions(-qinline=level=10 -qpath=IL:/data/video_files/latest.tpo/)
 endif()
 
+# this option is to enable the inclusion of dynamic HDR10 library to the libx265 compilation
+option(ENABLE_DYNAMIC_HDR10 "Enable dynamic HDR10 compilation" OFF)
 
 if(GCC)
     add_definitions(-Wall -Wextra -Wshadow)
     add_definitions(-D__STDC_LIMIT_MACROS=1)
+    if(ENABLE_DYNAMIC_HDR10)
+        add_definitions(-std=gnu++11)
+    else()
+        add_definitions(-std=gnu++98)
+    endif()
     if(ENABLE_PIC)
          add_definitions(-fPIC)
     endif(ENABLE_PIC)
@@ -362,20 +369,12 @@
 else(HIGH_BIT_DEPTH)
     add_definitions(-DHIGH_BIT_DEPTH=0 -DX265_DEPTH=8)
 endif(HIGH_BIT_DEPTH)
-# this option is to enable the inclusion of dynamic HDR10 library to the libx265 compilation
-option(ENABLE_DYNAMIC_HDR10 "Enable dynamic HDR10 compilation" OFF)
+
 if (ENABLE_DYNAMIC_HDR10)
     add_subdirectory(dynamicHDR10)
     include_directories(dynamicHDR10)
     add_definitions(-DENABLE_DYNAMIC_HDR10)
 endif(ENABLE_DYNAMIC_HDR10)
-if(GCC)
-    if(ENABLE_DYNAMIC_HDR10)
-        add_definitions(-std=gnu++11)
-    else()
-        add_definitions(-std=gnu++98)
-    endif()
-endif(GCC)
 
 # this option can only be used when linking multiple libx265 libraries
 # together, and some alternate API access method is implemented.