diff options
| -rw-r--r-- | ChangeLog.manual | 4 | ||||
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 7 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 11 | ||||
| -rw-r--r-- | Source/cmTarget.h | 2 |
5 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog.manual b/ChangeLog.manual index ecf03f5..ef8571b 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,3 +1,7 @@ +Changes in CMake 2.8.10 (since 2.8.10-rc3) +---------------------------------------------- +None + Changes in CMake 2.8.10-rc3 (since 2.8.10-rc2) ---------------------------------------------- Rolf Eike Beer (2): diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index e2cc427..224c88e 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -87,6 +87,7 @@ if(WIN32 AND NOT CYGWIN) find_library(LIB_EAY_DEBUG NAMES libeay32MDd + libeay32d ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" @@ -108,6 +109,7 @@ if(WIN32 AND NOT CYGWIN) find_library(SSL_EAY_DEBUG NAMES ssleay32MDd + ssleay32d ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" @@ -127,6 +129,11 @@ if(WIN32 AND NOT CYGWIN) "lib/VC" ) + set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}") + set(LIB_EAY_LIBRARY_RELEASE "${LIB_EAY_RELEASE}") + set(SSL_EAY_LIBRARY_DEBUG "${SSL_EAY_DEBUG}") + set(SSL_EAY_LIBRARY_RELEASE "${SSL_EAY_RELEASE}") + include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) select_library_configurations(LIB_EAY) select_library_configurations(SSL_EAY) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ab65d90..0894fa0 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -3,4 +3,4 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 10) set(CMake_VERSION_TWEAK 0) -set(CMake_VERSION_RC 3) +#set(CMake_VERSION_RC 3) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 423b350..f3eb52b 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -2584,7 +2584,10 @@ cmTarget::OutputInfo const* cmTarget::GetOutputInfo(const char* config) OutputInfo info; this->ComputeOutputDir(config, false, info.OutDir); this->ComputeOutputDir(config, true, info.ImpDir); - this->ComputePDBOutputDir(config, info.PdbDir); + if(!this->ComputePDBOutputDir(config, info.PdbDir)) + { + info.PdbDir = info.OutDir; + } OutputInfoMapType::value_type entry(config_upper, info); i = this->Internal->OutputInfoMap.insert(entry).first; } @@ -3940,7 +3943,7 @@ bool cmTarget::ComputeOutputDir(const char* config, } //---------------------------------------------------------------------------- -void cmTarget::ComputePDBOutputDir(const char* config, std::string& out) +bool cmTarget::ComputePDBOutputDir(const char* config, std::string& out) { // Look for a target property defining the target output directory // based on the target type. @@ -3980,8 +3983,7 @@ void cmTarget::ComputePDBOutputDir(const char* config, std::string& out) } if(out.empty()) { - // Default to the current output directory. - out = "."; + return false; } // Convert the output path to a full path in case it is @@ -3996,6 +3998,7 @@ void cmTarget::ComputePDBOutputDir(const char* config, std::string& out) this->Makefile->GetLocalGenerator()->GetGlobalGenerator()-> AppendDirectoryForConfig("/", config, "", out); } + return true; } //---------------------------------------------------------------------------- diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 558bfab..e442d25 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -577,7 +577,7 @@ private: struct OutputInfo; OutputInfo const* GetOutputInfo(const char* config); bool ComputeOutputDir(const char* config, bool implib, std::string& out); - void ComputePDBOutputDir(const char* config, std::string& out); + bool ComputePDBOutputDir(const char* config, std::string& out); // Cache import information from properties for each configuration. struct ImportInfo; |