From: Milan Ševčík <majlen@civ.zcu.cz>
Date: Fri, 17 Mar 2017 14:36:37 +0000 (+0100)
Subject: Add_extra_compilation_flags macro needs to run before adding sources
X-Git-Tag: v1.2.0^2~98^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0076adccb5c6750283aba478d83efb52741a475;p=thirdparty%2Fzstd.git

Add_extra_compilation_flags macro needs to run before adding sources

Also adding comments in the top-level CMakeLists.txt
---

diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
index d0f6daade..7fa8bbc79 100644
--- a/build/cmake/CMakeLists.txt
+++ b/build/cmake/CMakeLists.txt
@@ -11,6 +11,15 @@ PROJECT(zstd)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
 SET(ZSTD_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../..")
 
+#-----------------------------------------------------------------------------
+# Add extra compilation flags
+#-----------------------------------------------------------------------------
+INCLUDE(CMakeModules/AddExtraCompilationFlags.cmake)
+ADD_EXTRA_COMPILATION_FLAGS()
+
+#-----------------------------------------------------------------------------
+# Options
+#-----------------------------------------------------------------------------
 OPTION(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF)
 OPTION(ZSTD_MULTITHREAD_SUPPORT "MULTITHREADING SUPPORT" ON)
 OPTION(ZSTD_BUILD_CONTRIB "BUILD CONTRIB" OFF)
@@ -23,6 +32,9 @@ ELSE (ZSTD_LEGACY_SUPPORT)
     ADD_DEFINITIONS(-DZSTD_LEGACY_SUPPORT=0)
 ENDIF (ZSTD_LEGACY_SUPPORT)
 
+#-----------------------------------------------------------------------------
+# Add source directories
+#-----------------------------------------------------------------------------
 ADD_SUBDIRECTORY(lib)
 ADD_SUBDIRECTORY(programs)
 ADD_SUBDIRECTORY(tests)
@@ -31,11 +43,8 @@ IF (ZSTD_BUILD_CONTRIB)
 ENDIF (ZSTD_BUILD_CONTRIB)
 
 #-----------------------------------------------------------------------------
-# Add extra compilation flags
+# Add clean-all target
 #-----------------------------------------------------------------------------
-INCLUDE(CMakeModules/AddExtraCompilationFlags.cmake)
-ADD_EXTRA_COMPILATION_FLAGS()
-
 ADD_CUSTOM_TARGET(clean-all
    COMMAND ${CMAKE_BUILD_TOOL} clean
    COMMAND rm -rf ${CMAKE_BINARY_DIR}/