erroneous file changes

7 years ago · 8b0dc7ea8c
parent bdd5af1345
commit 8b0dc7ea8c
3 changed files with 1 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,6 +14,7 @@ autom4te.cache
 config.log
 config.status
 config.h*
+!config.h.in
 configure
 po/POTFILES
 stamp-h1
--- 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)
--- 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)