1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
|
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
colmap (3.4-2) UNRELEASED; urgency=medium
.
* Add desktop file.
* Add debian/README.source.
* Disable AVX/SSE. Thanks to Adrian Bunk for the patch. (Closes: #890106)
Author: Gürkan Myczko <gurkan@phys.ethz.ch>
Bug-Debian: https://bugs.debian.org/890106
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2018-02-22
--- colmap-3.4.orig/cmake/CheckSSEExtensions.cmake
+++ colmap-3.4/cmake/CheckSSEExtensions.cmake
@@ -4,10 +4,6 @@ include(CheckCXXSourceRuns)
# SSE
################################################################################
-if(IS_GNU OR IS_CLANG)
- set(CMAKE_REQUIRED_FLAGS "-msse")
-endif()
-
CHECK_CXX_SOURCE_RUNS("
#include <xmmintrin.h>
int main() {
@@ -25,10 +21,6 @@ CHECK_CXX_SOURCE_RUNS("
# SSE 2
################################################################################
-if(IS_GNU OR IS_CLANG)
- set(CMAKE_REQUIRED_FLAGS "-msse2")
-endif()
-
CHECK_CXX_SOURCE_RUNS("
#include <emmintrin.h>
int main() {
@@ -45,10 +37,6 @@ CHECK_CXX_SOURCE_RUNS("
# SSE 3
################################################################################
-if(IS_GNU OR IS_CLANG)
- set(CMAKE_REQUIRED_FLAGS "-msse3")
-endif()
-
CHECK_CXX_SOURCE_RUNS("
#include <pmmintrin.h>
int main() {
@@ -65,10 +53,6 @@ CHECK_CXX_SOURCE_RUNS("
# SSE 4.1
################################################################################
-if(IS_GNU OR IS_CLANG)
- set(CMAKE_REQUIRED_FLAGS "-msse4.1")
-endif()
-
CHECK_CXX_SOURCE_RUNS("
#include <smmintrin.h>
int main() {
@@ -87,10 +71,6 @@ CHECK_CXX_SOURCE_RUNS("
# SSE 4.2
################################################################################
-if(IS_GNU OR IS_CLANG)
- set(CMAKE_REQUIRED_FLAGS "-msse4.2")
-endif()
-
CHECK_CXX_SOURCE_RUNS("
#include <emmintrin.h>
#include <nmmintrin.h>
@@ -113,10 +93,6 @@ CHECK_CXX_SOURCE_RUNS("
# AVX
################################################################################
-if(IS_GNU OR IS_CLANG)
- set(CMAKE_REQUIRED_FLAGS "-mavx")
-endif()
-
CHECK_CXX_SOURCE_RUNS("
#include <immintrin.h>
#include <stdio.h>
|