Moving things around to make it nice

Also rewrite some comments

1 files changed, 9 insertions, 9 deletions

diff --git a/build_settings.cmake b/build_settings.cmake
index 59f73dc3e70..c8c3ceb8b16 100644
--- a/build_settings.cmake
+++ b/build_settings.cmake
@@ -1,8 +1,8 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 # @author Vegard Sjonfjell
-if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-    set(OS_IS_MACOSX true)
-endif()
+
+include(vtag.cmake)
+
 # Build options
 # Whether to build unit tests as part of the 'all' target
 set(EXCLUDE_TESTS_FROM_ALL FALSE CACHE BOOL "If TRUE, do not build tests as part of the 'all' target")
@@ -13,7 +13,6 @@ set(WARN_OPTS "-Wuninitialized -Werror -Wall -W -Wchar-subscripts -Wcomment -Wfo
 # C and C++ compiler flags
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 ${WARN_OPTS} -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -DBOOST_DISABLE_ASSERTS -DWITH_SHIPPED_GEOIP -march=westmere -mtune=intel")
 
-include(vtag.cmake)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VTAG_DEFINES}")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} -Wnon-virtual-dtor -fvisibility-inlines-hidden -fdiagnostics-color=auto")
@@ -27,6 +26,8 @@ set(CMAKE_CXX_STANDARD 14)
 # Always build shared libs if not explicitly specified
 set(BUILD_SHARED_LIBS ON)
 
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+
 # Default RPATH settings for CMake 3.4:
 # For non-installed targets, reference external libraries using an RPATH into the build tree.
 # For installed targets, reference external libraries using INSTALL_RPATH (i.e. /home/y/lib64 on ylinux)
@@ -34,8 +35,8 @@ set(CMAKE_CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 
-# OSX Stuff
-if(OS_IS_MACOSX)
+# OS X Stuff
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
     set(MACOSX_RPATH ON)
 
     if(__COMPILER_GNU)
@@ -44,13 +45,14 @@ if(OS_IS_MACOSX)
     endif()
 endif()
 
-# Use ccache if it is found
+# Find ccache and use it if it is found
 find_program(CCACHE_EXECUTABLE ccache)
 if(CCACHE_EXECUTABLE)
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_EXECUTABLE})
     set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_EXECUTABLE})
 endif()
 
+# Check for valgrind and set flags
 find_program(VALGRIND_EXECUTABLE valgrind)
 if(VALGRIND_EXECUTABLE)
     set(VALGRIND_SUPPRESSIONS_FILE "${PROJECT_SOURCE_DIR}/valgrind-suppressions.txt")
@@ -58,8 +60,6 @@ if(VALGRIND_EXECUTABLE)
     set(VALGRIND_COMMAND "${VALGRIND_EXECUTABLE} ${VALGRIND_OPTIONS}")
 endif()
 
-set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-
 if(EXTRA_LINK_DIRECTORY)
     link_directories(${EXTRA_LINK_DIRECTORY})
 endif()