diff options
author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-11-20 00:20:18 +0100 |
---|---|---|
committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-11-20 00:20:18 +0100 |
commit | bf6a7d09e993de577e07a378bf6aa6ce7c0c3651 (patch) | |
tree | 9bc09d00a210c5f33bfc6b614868dcde7e60c1fd /cmake/build_configurations | |
parent | e2fb2141d34f0617adbda78679fafa05756cf043 (diff) | |
download | mariadb-git-bf6a7d09e993de577e07a378bf6aa6ce7c0c3651.tar.gz |
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)
Diffstat (limited to 'cmake/build_configurations')
-rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index b3f7cdefd95..87b9ba46864 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -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) |