Commit 03dba1a5 authored by Jacob Becker's avatar Jacob Becker

fix has and remove old patches

parent c285d5a0
diff --git a/core/vil/io/CMakeLists.txt b/core/vil/io/CMakeLists.txt
index 4b9800f1..6570e0e 100644
--- a/core/vil/io/CMakeLists.txt
+++ b/core/vil/io/CMakeLists.txt
@@ -11,7 +11,7 @@ AUX_SOURCE_DIRECTORY(Templates vil_io_sources)
IF(CMAKE_COMPILER_IS_GNUCXX)
SET_SOURCE_FILES_PROPERTIES(Templates/vsl_vector_io+vcl_vector+vil_image_view+float---.cxx
PROPERTIES
- COMPILE_FLAGS -ftemplate-depth-35)
+ COMPILE_FLAGS -ftemplate-depth-50)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ADD_LIBRARY(vil_io ${vil_io_sources})
diff --git a/core/vnl/io/CMakeLists.txt b/core/vnl/io/CMakeLists.txt
index 74da98e..3637b54 100644
--- a/core/vnl/io/CMakeLists.txt
+++ b/core/vnl/io/CMakeLists.txt
@@ -22,7 +22,7 @@ AUX_SOURCE_DIRECTORY(Templates vnl_io_sources)
IF(CMAKE_COMPILER_IS_GNUCXX)
SET_SOURCE_FILES_PROPERTIES(Templates/vsl_vector_io+vcl_vector+vcl_vector+vnl_vector+double----.cxx
PROPERTIES
- COMPILE_FLAGS -ftemplate-depth-35)
+ COMPILE_FLAGS -ftemplate-depth-50)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ADD_LIBRARY(vnl_io ${vnl_io_sources} )
diff --git a/vcl/vcl_compiler.h b/vcl/vcl_compiler.h
index a20eb8e..4fc5981 100644
--- a/vcl/vcl_compiler.h
+++ b/vcl/vcl_compiler.h
@@ -119,6 +119,12 @@
# else
# define VCL_GCC_40
# endif
+# elif (__GNUC__==5)
+# define VCL_GCC_4
+# define VCL_GCC_41
+# elif (__GNUC__==6)
+# define VCL_GCC_4
+# define VCL_GCC_41
# else
# error "Dunno about this gcc"
# endif
include("${CMAKE_CURRENT_LIST_DIR}/../vxl.cmake")
superbuild_apply_patch(vxl vcl-detect-gcc5
"Add support for GCC 5 and up")
superbuild_apply_patch(vxl gcc6-template-depth
"GCC6 has deeper templates")
......@@ -31,7 +31,7 @@ superbuild_set_revision(cmbworkflows
superbuild_set_revision(vxl
URL "https://github.com/judajake/vxl/archive/da28c93.zip"
URL_MD5 994fa5836eb70c589498dbf10740c4eb)
URL_MD5 04187d3839c5eef9cad388a1ad9aa22c)
# Use the tweaked cmake build of zeromq
superbuild_set_revision(zeromq
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment