From: Dimitrios Eftaxiopoulos Date: Sun, 10 Aug 2014 22:19:38 +0000 (+0300) Subject: Reintroduce CMakeLists.patch X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~121 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c66e174543e78a9108baec9fcae0f7ebe55d9e35;p=mathgl.git Reintroduce CMakeLists.patch --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 8aa7bd3..0a117ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,9 +12,6 @@ set(CMAKE_VERBOSE_MAKEFILE ON) #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$") @@ -62,7 +59,7 @@ include(CMakeDependentOption) 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" ON) +option(enable-mpi "Enable mpi") option(enable-opengl "Enable OpenGL support" ON) option(enable-all-docs "Enable all documentation building") #option(enable-doc "Enable documentation building") diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch new file mode 100644 index 0000000..f186b47 --- /dev/null +++ b/debian/patches/CMakeLists.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,7 +92,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 4adf178..e20e679 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ widgets.patch +CMakeLists.patch