[SCM] supercollider-sc3-plugins/master: use cmake's CHECK_C_COMPILER_FLAG command instead move include, don't set SSE twice

[hanno-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c2ad0d0c08ad416fc164f3dae8efee94ed991197
Author: Hanno Zulla <hanno.zulla at epublica.de>
Date:   Thu Feb 25 16:44:39 2016 +0100

    use cmake's CHECK_C_COMPILER_FLAG command instead
    move include, don't set SSE twice

diff --git a/debian/patches/03-sse-only-on-x86.patch b/debian/patches/03-sse-only-on-x86.patch
index 39e7648..215fe8f 100644
--- a/debian/patches/03-sse-only-on-x86.patch
+++ b/debian/patches/03-sse-only-on-x86.patch
@@ -9,18 +9,42 @@ Last-Update: 2016-02-25
 Index: supercollider-sc3-plugins/CMakeLists.txt
 ===================================================================
 --- supercollider-sc3-plugins.orig/CMakeLists.txt	2016-01-11 09:12:04.580499484 +0100
-+++ supercollider-sc3-plugins/CMakeLists.txt	2016-02-25 14:56:04.876478889 +0100
-@@ -53,6 +53,15 @@
++++ supercollider-sc3-plugins/CMakeLists.txt	2016-02-25 16:36:04.307733672 +0100
+@@ -53,6 +53,39 @@
  if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
      add_definitions(-fvisibility=hidden)
  
-+    IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(x86|amd64|i.86)")
-+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}   -msse -msse2")
-+        set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -msse -msse2")
-+        if(NOT APPLE AND NOT CMAKE_COMPILER_IS_CLANG)
-+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
-+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
-+        endif()
++    include (${CMAKE_ROOT}/Modules/CheckCCompilerFlag.cmake)
++    include (${CMAKE_ROOT}/Modules/CheckCXXCompilerFlag.cmake)
++
++    CHECK_C_COMPILER_FLAG(-msse HAS_SSE)
++    CHECK_CXX_COMPILER_FLAG(-msse HAS_CXX_SSE)
++
++    if (HAS_SSE)
++        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse")
++    endif()
++    if (HAS_CXX_SSE)
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
++    endif()
++
++    CHECK_C_COMPILER_FLAG(-msse2 HAS_SSE2)
++    CHECK_CXX_COMPILER_FLAG(-msse2 HAS_CXX_SSE2)
++
++    if (HAS_SSE2)
++        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2")
++    endif()
++    if (HAS_CXX_SSE2)
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
++    endif()
++
++    CHECK_C_COMPILER_FLAG(-mfpmath=sse HAS_FPMATH_SSE)
++    CHECK_CXX_COMPILER_FLAG(-mfpmath=sse HAS_CXX_FPMATH_SSE)
++
++    if (HAS_FPMATH_SSE)
++        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
++    endif()
++    if (HAS_CXX_FPMATH_SSE)
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
 +    endif()
 +
  	if(NATIVE)
@@ -29,7 +53,7 @@ Index: supercollider-sc3-plugins/CMakeLists.txt
 Index: supercollider-sc3-plugins/source/StkInst/CMakeLists.txt
 ===================================================================
 --- supercollider-sc3-plugins.orig/source/StkInst/CMakeLists.txt	2016-01-11 09:12:04.892500979 +0100
-+++ supercollider-sc3-plugins/source/StkInst/CMakeLists.txt	2016-02-25 14:56:55.635427484 +0100
++++ supercollider-sc3-plugins/source/StkInst/CMakeLists.txt	2016-02-25 16:05:01.980361599 +0100
 @@ -25,6 +25,13 @@
      include_directories(${STKDIR})
      include_directories(${STKDIR}/include)
@@ -44,18 +68,15 @@ Index: supercollider-sc3-plugins/source/StkInst/CMakeLists.txt
  endif()
  
  include_directories(${SC_PATH}/include/plugin_interface)
-@@ -39,23 +46,18 @@
+@@ -38,24 +45,11 @@
+     set(CMAKE_SHARED_MODULE_SUFFIX ".scx")
  endif()
      
- if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
+-if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
 -    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mstackrealign")
 -    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mstackrealign")
-+    IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(x86|amd64|i.86)")
-+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mstackrealign")
-+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mstackrealign")
-+    endif()
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- endif()
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+-endif()
 -if(NOT SYSTEM_STK)
 -    add_definitions("-D_STK_DEBUG_")
 -endif()
@@ -64,7 +85,7 @@ Index: supercollider-sc3-plugins/source/StkInst/CMakeLists.txt
 -if(NOT is_big_endian)
 -    add_definitions("-D__LITTLE_ENDIAN__")
 -endif()
- 
+-
  add_library(${PROJECT} MODULE ${PROJECT}.cpp ${STKSources})
  if(SYSTEM_STK)
      target_link_libraries(${PROJECT} ${STK_LIBRARY})

-- 
supercollider-sc3-plugins packaging