diff options
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 19 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 6 | ||||
| -rw-r--r-- | Templates/TestDriver.cxx.in | 10 |
4 files changed, 26 insertions, 11 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 2974b9e..47a70f5 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -452,6 +452,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") D:/ ENV ProgramFiles PATH_SUFFIXES + wxWidgets-3.1.0 wxWidgets-3.0.2 wxWidgets-3.0.1 wxWidgets-3.0.0 @@ -503,10 +504,22 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") # settings. if(MINGW) set(WX_LIB_DIR_PREFIX gcc) - elseif(CMAKE_CL_64) - set(WX_LIB_DIR_PREFIX vc_x64) - else() + elseif(MSVC) set(WX_LIB_DIR_PREFIX vc) + if(MSVC14) + set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}140) + elseif(MSVC12) + set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}120) + elseif(MSVC11) + set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}110) + elseif(MSVC10) + set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}100) + elseif(MSVC90) + set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}90) + endif() + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}_x64) + endif() endif() if(BUILD_SHARED_LIBS) find_path(wxWidgets_LIB_DIR diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d26debc..e8a4d2c 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 6) -set(CMake_VERSION_PATCH 20160825) +set(CMake_VERSION_PATCH 20160826) #set(CMake_VERSION_RC 1) diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index c33a291..1b1d04b 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2741,9 +2741,9 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile() this->WriteString("<AppxPackageArtifactsDir>", 2); (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir) << "\\</AppxPackageArtifactsDir>\n"; - this->WriteString("<ProjectPriFullPath>" - "$(TargetDir)resources.pri</ProjectPriFullPath>\n", - 2); + this->WriteString("<ProjectPriFullPath>", 2); + (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir) + << "\\resources.pri</ProjectPriFullPath>\n"; // If we are missing files and we don't have a certificate and // aren't targeting WP8.0, add a default certificate diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in index ffa6999..3e0afa5 100644 --- a/Templates/TestDriver.cxx.in +++ b/Templates/TestDriver.cxx.in @@ -33,19 +33,21 @@ static functionMapEntry cmakeGeneratedFunctionMapEntries[] = { static char* lowercase(const char *string) { char *new_string, *p; + size_t stringSize = 0; #ifdef __cplusplus - new_string = static_cast<char *>(malloc(sizeof(char) * - static_cast<size_t>(strlen(string) + 1))); + stringSize = static_cast<size_t>(strlen(string) + 1); + new_string = static_cast<char *>(malloc(sizeof(char) * stringSize)); #else - new_string = (char *)(malloc(sizeof(char) * (size_t)(strlen(string) + 1))); + stringSize = (size_t)(strlen(string) + 1); + new_string = (char *)(malloc(sizeof(char) * stringSize)); #endif if (!new_string) { return 0; } - strcpy(new_string, string); + strncpy(new_string, string, stringSize); p = new_string; while (*p != 0) { |