From aa2e8b5fbf2df8aa641b27f06799ef29da575400 Mon Sep 17 00:00:00 2001
From: isucan <isucan@253336fb-580f-4252-a368-f3cef5a2a82b>
Date: Mon, 27 Aug 2012 17:09:45 +0000
Subject: [PATCH] minor updates to build system
git-svn-id: https://kforge.ros.org/fcl/fcl_ros@179 253336fb-580f-4252-a368-f3cef5a2a82b
---
trunk/fcl/CMakeLists.txt | 2 +-
trunk/fcl/CMakeModules/FCLCheckSSE.cmake | 83 -------------------
.../fcl/traversal/traversal_node_setup.h | 1 +
3 files changed, 2 insertions(+), 84 deletions(-)
delete mode 100644 trunk/fcl/CMakeModules/FCLCheckSSE.cmake
diff --git a/trunk/fcl/CMakeLists.txt b/trunk/fcl/CMakeLists.txt
index 2a862dbe..517210a3 100644
--- a/trunk/fcl/CMakeLists.txt
+++ b/trunk/fcl/CMakeLists.txt
@@ -19,7 +19,7 @@ option(FCL_USE_SSE "Whether FCL should SSE instructions" ON)
set(FCL_HAVE_SSE 0)
if(FCL_USE_SSE)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
- set(FCL_HAVE_SSE 1)
+ set(FCL_HAVE_SSE 0) #always disable, for now
add_definitions(-march=native)
endif()
# TODO: do something similar for other compilers
diff --git a/trunk/fcl/CMakeModules/FCLCheckSSE.cmake b/trunk/fcl/CMakeModules/FCLCheckSSE.cmake
deleted file mode 100644
index f03d5cfd..00000000
--- a/trunk/fcl/CMakeModules/FCLCheckSSE.cmake
+++ /dev/null
@@ -1,83 +0,0 @@
-macro(fcl_check_for_sse)
- # check for SSE extensions
- include(CheckCXXSourceRuns)
- if( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )
- set(SSE_FLAGS)
-
- set(CMAKE_REQUIRED_FLAGS "-msse3")
- check_cxx_source_runs("
- #include <pmmintrin.h>
-
- int main()
- {
- __m128d a, b;
- double vals[2] = {0};
- a = _mm_loadu_pd(vals);
- b = _mm_hadd_pd(a,a);
- _mm_storeu_pd(vals, b);
- return 0;
- }"
- HAS_SSE3_EXTENSIONS)
-
- set(CMAKE_REQUIRED_FLAGS "-msse2")
- check_cxx_source_runs("
- #include <emmintrin.h>
-
- int main()
- {
- __m128d a, b;
- double vals[2] = {0};
- a = _mm_loadu_pd(vals);
- b = _mm_add_pd(a,a);
- _mm_storeu_pd(vals,b);
- return 0;
- }"
- HAS_SSE2_EXTENSIONS)
-
- set(CMAKE_REQUIRED_FLAGS "-msse")
- check_cxx_source_runs("
- #include <xmmintrin.h>
- int main()
- {
- __m128 a, b;
- float vals[4] = {0};
- a = _mm_loadu_ps(vals);
- b = a;
- b = _mm_add_ps(a,b);
- _mm_storeu_ps(vals,b);
- return 0;
- }"
- HAS_SSE_EXTENSIONS)
-
- set(CMAKE_REQUIRED_FLAGS)
-
- if(HAS_SSE3_EXTENSIONS)
- set(SSE_FLAGS "-msse3 -mfpmath=sse")
- message(STATUS " Found SSE3 extensions, using flags: ${SSE_FLAGS}")
- elseif(HAS_SSE2_EXTENSIONS)
- set(SSE_FLAGS "-msse2 -mfpmath=sse")
- message(STATUS " Found SSE2 extensions, using flags: ${SSE_FLAGS}")
- elseif(HAS_SSE_EXTENSIONS)
- set(SSE_FLAGS "-msse -mfpmath=sse")
- message(STATUS " Found SSE extensions, using flags: ${SSE_FLAGS}")
- endif()
- elseif(MSVC)
- check_cxx_source_runs("
- #include <emmintrin.h>
-
- int main()
- {
- __m128d a, b;
- double vals[2] = {0};
- a = _mm_loadu_pd(vals);
- b = _mm_add_pd(a,a);
- _mm_storeu_pd(vals,b);
- return 0;
- }"
- HAS_SSE2_EXTENSIONS)
- if( HAS_SSE2_EXTENSIONS )
- message(STATUS " Found SSE2 extensions")
- set(SSE_FLAGS "/arch:SSE2 /fp:fast -D__SSE__ -D__SSE2__" )
- endif()
- endif()
-endmacro(fcl_check_for_sse)
diff --git a/trunk/fcl/include/fcl/traversal/traversal_node_setup.h b/trunk/fcl/include/fcl/traversal/traversal_node_setup.h
index 8e640dc6..b9ead423 100644
--- a/trunk/fcl/include/fcl/traversal/traversal_node_setup.h
+++ b/trunk/fcl/include/fcl/traversal/traversal_node_setup.h
@@ -38,6 +38,7 @@
#ifndef FCL_TRAVERSAL_NODE_SETUP_H
#define FCL_TRAVERSAL_NODE_SETUP_H
+#include "fcl/config.h"
#include "fcl/traversal/traversal_node_bvhs.h"
#include "fcl/traversal/traversal_node_shapes.h"
#include "fcl/traversal/traversal_node_bvh_shape.h"
--
GitLab