From a98b03a7e003fedcce13933f923a69100745db97 Mon Sep 17 00:00:00 2001
From: Tahir Akhlaq <xdemolish@hotmail.com>
Date: Tue, 12 Sep 2017 18:46:25 +0100
Subject: [PATCH] fixed search paths for mysql cpp connector - fixed edit and
 continue being disabled (-DCMAKE_BUILD_TYPE="Debug" to enable)

---
 CMakeLists.txt                    | 4 ----
 cmake/FindMySQLConnectorCPP.cmake | 3 +++
 cmake/compiler.cmake              | 6 ++++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5d37a77..e4a846c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,10 +38,6 @@ else()
     endif()
 endif()
 
-if( NOT $MYSQLCONNECTORCPP_ROOT_DIR )
-    set( MYSQLCONNECTORCPP_ROOT_DIR "G:\\programming\\libs\\MySQL1.1.9" )
-endif()
-
 FIND_PACKAGE(MySQLConnectorCPP)
 
 if( MYSQLCONNECTORCPP_FOUND )
diff --git a/cmake/FindMySQLConnectorCPP.cmake b/cmake/FindMySQLConnectorCPP.cmake
index 5dfa4aa9..49d25831 100644
--- a/cmake/FindMySQLConnectorCPP.cmake
+++ b/cmake/FindMySQLConnectorCPP.cmake
@@ -10,6 +10,9 @@
 
 set(MYSQLCONNECTORCPP_ROOT_DIR
         "${MYSQLCONNECTORCPP_ROOT_DIR}"
+        "C:\\Program Files (x86)\\MySQL\\Connector.C++ 1.1\\"
+        "C:\\Program Files\\MySQL\\Connector.C++ 1.1\\"
+        "G:\\programming\\libs\\MySQL1.1.9\\"
         CACHE
         PATH
         "Where to start looking for this component.")
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index fb93b77c..8644e671 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -8,6 +8,12 @@ else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHc")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+  
+  # edit and continue
+  if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    message(STATUS "Disabling /SAFESEH")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
+  endif()
 endif()