From 8b0dc7ea8cce657048b432db6ca5888c867a8699 Mon Sep 17 00:00:00 2001 From: morro Date: Tue, 20 Nov 2018 21:22:48 +0100 Subject: [PATCH] erroneous file changes --- .gitignore | 1 + CMakeLists.txt | 2 -- src/CMakeLists.txt | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3e133a61..9e40d861 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ autom4te.cache config.log config.status config.h* +!config.h.in configure po/POTFILES stamp-h1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6252ae01..2715e91b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -387,5 +387,3 @@ if (CMAKE_DEBUG_INCLUDES_LDFLAGS) message ("Include directories: ${xournalpp_INCLUDE_DIRS}") message ("LDFLAGS/LIBRARIES: ${xournalpp_LDFLAGS}") endif (CMAKE_DEBUG_INCLUDES_LDFLAGS) - -set(CMAKE_BUILD_TYPE Debug) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fde413f1..72d82c70 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,8 +25,6 @@ endif () option (DEBUG_COMPILE "Pass -Wall to CXX_FLAGS" OFF) mark_as_advanced (FORCE DEBUG_COMPILE) -set(CMAKE_CXX_FLAGS "-fpermissive") - if (DEBUG_COMPILE) add_definitions (-Wall) endif (DEBUG_COMPILE)