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

@@ -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

trunk/fcl/CMakeModules/FCLCheckSSE.cmake

-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)

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"