Merge pull request #7 from lyssdod/master

Fix build on amd64 Gentoo

Author: unbornchikken

cmake/BoostLibInstaller.cmake

@@ -180,7 +180,7 @@ function(boost_lib_installer req_boost_version req_boost_libs)
     # b2 headers
     if(NOT EXISTS ${install_dir}/boost/)
         message(STATUS "Generating headers ...")
-        execute_process(COMMAND ${b2_command} headers WORKING_DIRECTORY ${install_dir} RESULT_VARIABLE err OUTPUT_VARIABLE err_msg)
+        execute_process(COMMAND ${b2_command} --ignore-site-config headers WORKING_DIRECTORY ${install_dir} RESULT_VARIABLE err OUTPUT_VARIABLE err_msg)
         if(err)
             message(FATAL_ERROR "b2 error:\n${err_msg}")
         endif(err)

cmake/GetBoostLibB2Args.cmake

@@ -18,7 +18,8 @@ function(get_boots_lib_b2_args)
                stage
                --stagedir=${stage_dir}
                -d+2
-               --hash)
+               --hash
+               --ignore-site-config)
 
     message(STATUS "Generating b2 args.")
 
@@ -70,7 +71,7 @@ function(get_boots_lib_b2_args)
         else()
             list(APPEND b2Args cxxflags=-fPIC cxxflags=-std=c++11)
             # Need to configure the toolset based on whatever version CMAKE_CXX_COMPILER is
-            string(REGEX MATCH "[0-9]+\\.[0-9]+" ToolsetVer "${CMAKE_CXX_COMPILER_VERSION}")
+            string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" ToolsetVer "${CMAKE_CXX_COMPILER_VERSION}")
             if(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
                 list(APPEND b2Args toolset=clang-${ToolsetVer})
                 if(HAVE_LIBC++)
@@ -83,4 +84,4 @@ function(get_boots_lib_b2_args)
     endif()
 
     set(b2Args "${b2Args}" PARENT_SCOPE)
-endfunction(get_boots_lib_b2_args)
+endfunction(get_boots_lib_b2_args)