List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:November 19 2010 11:20pm
Subject:bzr commit into mysql-5.5-bugteam branch (vvaintroub:3129) Bug#58313
View as plain text  
#At file:///H:/bzr-new/mysql-5.5-bugteam/ based on revid:vvaintroub@stripped

 3129 Vladislav Vaintroub	2010-11-20
      Bug#58313: CMake stops with VS Express if -DBUILD_CONFIG=mysql_release.cmake
      
      Bug : -DBUILD_CONFIG=mysql_release sets SIGNCODE parameter which requires 
      singtool.exe (part of Windows SDK)  in order to be able to sign the binaries (
      only if valid certificate is found). However singtool is not a part of the SDK shipped
      with Visual Studio Express, so the build fails claiming missing singtools.exe
      
      Fix: Do not  use SIGNCODE  wiith VC Express.
      
      Also, fix broken nmake build (*.rc files could not be compiled due to ADD_DEFINITIONS
      contaning C/C++ compiler specific flags)

    modified:
      cmake/build_configurations/mysql_release.cmake
      cmake/os/Windows.cmake
=== modified file 'cmake/build_configurations/mysql_release.cmake'
--- a/cmake/build_configurations/mysql_release.cmake	2010-11-17 21:06:24 +0000
+++ b/cmake/build_configurations/mysql_release.cmake	2010-11-19 23:20:18 +0000
@@ -101,8 +101,10 @@ IF(NOT COMPILATION_COMMENT)
 ENDIF()
 
 IF(WIN32)
-  # Sign executables with authenticode certificate
-  SET(SIGNCODE 1 CACHE BOOL "")
+  IF(NOT CMAKE_USING_VC_FREE_TOOLS)
+    # Sign executables with authenticode certificate
+    SET(SIGNCODE 1 CACHE BOOL "")
+  ENDIF()
 ENDIF()
 
 IF(UNIX)

=== modified file 'cmake/os/Windows.cmake'
--- a/cmake/os/Windows.cmake	2010-06-22 16:40:14 +0000
+++ b/cmake/os/Windows.cmake	2010-11-19 23:20:18 +0000
@@ -91,7 +91,6 @@ IF(MSVC)
    STRING(REGEX REPLACE "/INCREMENTAL:([^ ]+)" "" CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO}")
   ENDFOREACH()
   
-  ADD_DEFINITIONS(-DPTHREAD_STACK_MIN=1048576)
   # Mark 32 bit executables large address aware so they can 
   # use > 2GB address space
   IF(CMAKE_SIZEOF_VOID_P MATCHES 4)
@@ -105,14 +104,9 @@ IF(MSVC)
   ENDIF()
   
   #TODO: update the code and remove the disabled warnings
-  ADD_DEFINITIONS(/wd4800 /wd4805)
-  IF (MSVC_VERSION GREATER 1310)
-    ADD_DEFINITIONS(/wd4996)
-  ENDIF()
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /we4099")
 
-  # Make class/struct definition mismatch an error (overseen too often,
-  # adds tons of new warnings)
-  ADD_DEFINITIONS(/we4099)
 
   IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
     # _WIN64 is defined by the compiler itself. 


Attachment: [text/bzr-bundle] bzr/vvaintroub@mysql.com-20101119232018-v2amthrcf8r75oxm.bundle
Thread
bzr commit into mysql-5.5-bugteam branch (vvaintroub:3129) Bug#58313Vladislav Vaintroub20 Nov