From 7c1dd82afe605c0f24ff15d799e7a768cdfc98b4 Mon Sep 17 00:00:00 2001 From: Shane Loretz Date: Mon, 2 Nov 2020 11:13:13 -0800 Subject: [PATCH 1/2] Require CMake 3.10 Signed-off-by: Shane Loretz --- CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e6f991647..1fec09152 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,13 +31,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -if(APPLE) - cmake_minimum_required(VERSION 3.0.0) -elseif(MSVC) - cmake_minimum_required(VERSION 3.1.3) -else() - cmake_minimum_required(VERSION 2.8.12) -endif() +cmake_minimum_required(VERSION 3.10) project(fcl CXX) From f4e5530765bd3b8593d7a06600bc5a6e93d2ed5f Mon Sep 17 00:00:00 2001 From: Shane Loretz Date: Fri, 23 Oct 2020 15:36:56 -0700 Subject: [PATCH 2/2] Check SSE support if CMake >= 3.10 Signed-off-by: Shane Loretz --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fec09152..f9c752e10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,13 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") set(FCL_TARGET_SUPPORT_X64_SSE OFF) else() - set(FCL_TARGET_SUPPORT_X64_SSE ON) + cmake_host_system_information(RESULT _has_sse QUERY HAS_SSE) + cmake_host_system_information(RESULT _has_sse2 QUERY HAS_SSE2) + if(_has_sse AND _has_sse2) + set(FCL_TARGET_SUPPORT_X64_SSE ON) + else() + set(FCL_TARGET_SUPPORT_X64_SSE OFF) + endif() endif() set(SSE_FLAGS "") option(FCL_USE_X64_SSE "Whether FCL should x64 SSE instructions" ${FCL_TARGET_SUPPORT_X64_SSE})