From 453f62f270ef73a987a1321ed7fcbd7bcccc90e3 Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Mon, 11 Aug 2014 00:32:49 +0300 Subject: [PATCH] Remove CMakeLists.txt.patch --- debian/patches/CMakeLists.txt.patch | 30 ----------------------------- debian/patches/series | 1 - 2 files changed, 31 deletions(-) delete mode 100644 debian/patches/CMakeLists.txt.patch diff --git a/debian/patches/CMakeLists.txt.patch b/debian/patches/CMakeLists.txt.patch deleted file mode 100644 index dd00659..0000000 --- a/debian/patches/CMakeLists.txt.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,6 +12,9 @@ - #set(MathGL_VERSION_MINOR 2.2) - set(MathGL_SOVERSION 7.3.0) - -+set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro") -+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro") -+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro") - - MACRO(MGL_DEPENDENT_OPTION option doc default depends1 force1 depends2 force2) - IF(${option}_ISSET MATCHES "^${option}_ISSET$") -@@ -59,7 +62,7 @@ - set(MGL_LIB_INSTALL_DIR "lib" CACHE STRING "Set library install directory") - - option(enable-double "Enable double precision in MathGL library" ON) --option(enable-mpi "Enable mpi") -+option(enable-mpi "Enable mpi" ON) - option(enable-opengl "Enable OpenGL support" ON) - option(enable-all-docs "Enable all documentation building") - #option(enable-doc "Enable documentation building") -@@ -92,7 +95,7 @@ - CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-all-widgets" ON) --CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON) -+CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" ON "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF) - diff --git a/debian/patches/series b/debian/patches/series index bc9da25..4adf178 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -CMakeLists.txt.patch widgets.patch -- 2.30.2