CMakeLists.txt

cmake/build_configurations/mysql_release.cmake
 - Corrected spelling ENABLE_LOCAL_INFILE => ENABLED_LOCAL_INFILE
 - In addition to "RelWithDebInfo", set target "Release" and "Debug"
 - Set Debug flags
 - Enabled SSL on Mac OS X
 - For gcc builds, set RELEASE and DEBUG flags as well
 - For g++ builds, added "-fno-implicit-templates"
 - Use "-O" (gcc -O1) for optimized binaries, as "DEBUG" in out case
   is more about enabling trace support to the server, no optimization
   makes binaries too slow to be practical to reproduce problems

cmake/os/WindowsCache.cmake
 - Removed unused HAVE_SYS_IOCTL

config.h.cmake
 - Added header checks and missing defines
 - Removed unused HAVE_SYS_IOCTL
 - Grouped and uncommented some HAVE_* that are really not
   defines, but internal variables used in the CMake setup,
 - Added hard coded flags for HP-UX and Mac OS X

configure.cmake
 - Added header checks and missing defines
 - Removed unused HAVE_SYS_IOCTL
 - "sys/dir.h" test needs "sys/types.h"
 - Corrected syntax for "sys/ptem.h" test
 - Don't exclude test for some types if Mac OS X, harmless
   to do the test and we want the HAVE_<type> settings
 - Added hard coded flags for HP-UX and Mac OS X

extra/yassl/CMakeLists.txt
extra/yassl/taocrypt/CMakeLists.txt
 - Added missing source file "template_instnt.cpp"

2 files changed, 66 insertions, 46 deletions

diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 97de0965f6b..b4d3dfc1c17 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -80,7 +80,7 @@ IF(FEATURE_SET)
   ENDFOREACH()
 ENDIF()
 
-OPTION(ENABLE_LOCAL_INFILE "" ON)
+OPTION(ENABLED_LOCAL_INFILE "" ON)
 SET(WITH_SSL bundled CACHE STRING "")
 SET(WITH_ZLIB bundled CACHE STRING "")
 
@@ -107,42 +107,53 @@ ENDIF()
 
 
 # Compiler options
-IF(UNIX)  
+IF(UNIX)
+
+  # Defaults if not set at all
+
+  SET(OPT_FLG "-O")
+  SET(DBG_FLG "-g")
+  SET(COMMON_CFLAGS   "")
+  SET(COMMON_CXXFLAGS "")
+
   # Default GCC flags
   IF(CMAKE_COMPILER_IS_GNUCXX)
-   SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -O3 -static-libgcc -fno-omit-frame-pointer")
-   SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O3 -static-libgcc -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti")
+    SET(OPT_FLG "-O3")
+    SET(DBG_FLG "-O")
+    SET(COMMON_CFLAGS   "-static-libgcc -g -fno-omit-frame-pointer")
+    SET(COMMON_CXXFLAGS "${COMMON_CFLAGS} -fno-implicit-templates -felide-constructors -fno-exceptions -fno-rtti")
   ENDIF()
-
   
   # HPUX flags
   IF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
     IF(CMAKE_C_COMPILER_ID MATCHES "HP")
       IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
-        SET(CMAKE_C_FLAGS 
-          "${CMAKE_C_FLAGS} +DD64 +DSitanium2 -mt -AC99")
-        SET(CMAKE_CXX_FLAGS 
-          "${CMAKE_CXX_FLAGS} +DD64 +DSitanium2 -mt -Aa")
-        SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} +O2")
-        SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} +O2")
+	SET(OPT_FLG "+O2")
+	SET(DBG_FLG "+O0")
+        SET(COMMON_CFLAGS   "+DD64 +DSitanium2 -mt -AC99")
+        SET(COMMON_CXXFLAGS "+DD64 +DSitanium2 -mt -Aa")
       ENDIF()
     ENDIF()
-    SET(WITH_SSL)
+    SET(WITH_SSL no)
   ENDIF()
   
   # Linux flags
   IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
     IF(CMAKE_C_COMPILER_ID MATCHES "Intel")
-      SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-static-intel -static-libgcc -g -O3 -unroll2 -ip -mp -restrict -no-ftz -no-prefetch")
-      SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-static-intel -static-libgcc -g -O3 -unroll2 -ip -mp -restrict -no-ftz -no-prefetch")
+      SET(OPT_FLG "-O3 -unroll2 -ip")
+      SET(DBG_FLG "")
+      SET(COMMON_CFLAGS   "-static-intel -static-libgcc -g -mp -restrict -no-ftz -no-prefetch")
+      SET(COMMON_CXXFLAGS "-static-intel -static-libgcc -g -mp -restrict -no-ftz -no-prefetch")
       SET(WITH_SSL no)
     ENDIF()
   ENDIF()
   
   # OSX flags
   IF(APPLE)
-   SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -Os -fno-common")
-   SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -Os -felide-constructors -fno-common")
+    SET(OPT_FLG "-Os")
+    SET(DBG_FLG "-O")
+    SET(COMMON_CFLAGS   "-g -fno-common")
+    SET(COMMON_CXXFLAGS "-g -felide-constructors -fno-common")
   ENDIF()
   
   # Solaris flags
@@ -152,38 +163,48 @@ IF(UNIX)
       SET(WITH_MYSQLD_LDFLAGS "-lmtmalloc" CACHE STRING "")
     ENDIF()
     IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
+      SET(DBG_FLG "")
       IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
         IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
-          # Solaris x86
-          SET(CMAKE_C_FLAGS_RELWITHDEBINFO
-            "-g -xO2 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
-          SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
-            "-g0 -xO2 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic")
+	  # Solaris x86
+          SET(OPT_FLG "-xO2")
+        ELSE()
+	  # Solaris x86_64
+          SET(OPT_FLG "-xO3")
+        ENDIF()
+	SET(COMMON_CFLAGS
+	  "-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
+	SET(COMMON_CXXFLAGS
+	  "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic")
+      ELSE() 
+        IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+          # Solaris sparc 32 bit
+          SET(OPT_FLG "-xO3")
+          SET(COMMON_CFLAGS   "-g -Xa -xstrconst -mt -xarch=sparc")
+          SET(COMMON_CXXFLAGS "-g0 -noex -mt -xarch=sparc")
         ELSE()
-          #  Solaris x64
-          SET(CMAKE_C_FLAGS_RELWITHDEBINFO 
-            "-g -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
-          SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-            "-g0 -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic")
-         ENDIF()
-       ELSE() 
-          IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
-            # Solaris sparc 32 bit
-            SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-g -xO3 -Xa -xstrconst -mt -xarch=sparc")
-            SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g0 -xO3 -noex -mt -xarch=sparc")
-          ELSE()
-            # Solaris sparc 64 bit
-            SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-g -xO3 -Xa -xstrconst -mt")
-            SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g0 -xO3 -noex -mt")
-          ENDIF()
-       ENDIF()
+          # Solaris sparc 64 bit
+          SET(OPT_FLG "-xO3")
+          SET(COMMON_CFLAGS   "-g -Xa -xstrconst -mt")
+          SET(COMMON_CXXFLAGS "-g0 -noex -mt")
+        ENDIF()
+      ENDIF()
     ENDIF()
   ENDIF()
-  
-  IF(CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}"
-      CACHE STRING "Compile flags")
-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}"
-      CACHE STRING "Compile flags")
-  ENDIF()
+
+  SET(CMAKE_CXX_FLAGS_RELEASE "${OPT_FLG} ${COMMON_CXXFLAGS}"
+    CACHE STRING "Release type C++ compiler flags")
+  SET(CMAKE_C_FLAGS_RELEASE "${OPT_FLG} ${COMMON_CFLAGS}"
+    CACHE STRING "Release type C compile flags")
+
+  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${OPT_FLG} ${COMMON_CXXFLAGS}"
+    CACHE STRING "Default/RelWithDebInfo type C++ compiler flags")
+  SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${OPT_FLG} ${COMMON_CFLAGS}"
+    CACHE STRING "Default/RelWithDebInfo type C compiler flags")
+
+  SET(CMAKE_CXX_FLAGS_DEBUG "${DBG_FLG} ${COMMON_CXXFLAGS}"
+    CACHE STRING "Debug type C++ compiler flags")
+  SET(CMAKE_C_FLAGS_DEBUG "${DBG_FLG} ${COMMON_CFLAGS}"
+    CACHE STRING "Debug type C compiler flags")
+
 ENDIF()
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake
index 68b6f2a6ddf..dbf3f136b6e 100644
--- a/cmake/os/WindowsCache.cmake
+++ b/cmake/os/WindowsCache.cmake
@@ -263,7 +263,6 @@ SET(HAVE_SYS_DIR_H CACHE  INTERNAL "")
 SET(HAVE_SYS_ERRLIST CACHE  INTERNAL "")
 SET(HAVE_SYS_FILE_H CACHE  INTERNAL "")
 SET(HAVE_SYS_FPU_H CACHE  INTERNAL "")
-SET(HAVE_SYS_IOCTL CACHE  INTERNAL "")
 SET(HAVE_SYS_IOCTL_H CACHE  INTERNAL "")
 SET(HAVE_SYS_IPC_H CACHE  INTERNAL "")
 SET(HAVE_SYS_MALLOC_H CACHE  INTERNAL "")