diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-01-11 13:30:18 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-01-11 13:30:18 (GMT) |
| commit | dc2ea35bb1212ebc3b6433b9181708ff06a395c6 (patch) | |
| tree | 7f1dcfc58481c25c53453c3ac3c5c25fc6715fd6 | |
| parent | fd5d9775fb34e28790ec3eec54596ae792dbed94 (diff) | |
| download | CMake-dc2ea35bb1212ebc3b6433b9181708ff06a395c6.zip CMake-dc2ea35bb1212ebc3b6433b9181708ff06a395c6.tar.gz CMake-dc2ea35bb1212ebc3b6433b9181708ff06a395c6.tar.bz2 | |
ENH: push a few more changes to 2.4.8
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ChangeLog.manual | 3 | ||||
| -rw-r--r-- | Source/cmInstallTargetGenerator.cxx | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7862f3..230f214 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MINOR 4) SET(CMake_VERSION_PATCH 8) # for an actual release this should not be defined -SET(CMake_VERSION_RC 11) +SET(CMake_VERSION_RC 12) SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}") diff --git a/ChangeLog.manual b/ChangeLog.manual index 1b8a21b..8db6296 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,3 +1,6 @@ +Changes in CMake 2.4.8 RC 12 +* Fix vs 9 so cmake can find it +* Fix bug 6230 MODULE install with versions was broken Changes in CMake 2.4.8 RC 11 * Remove ability to select install location for mac (it does not work) Changes in CMake 2.4.8 RC 10 diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 97ec2df..f5d9f30 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -79,6 +79,7 @@ void cmInstallTargetGenerator::GenerateScript(std::ostream& os) switch(type) { case cmTarget::SHARED_LIBRARY: + case cmTarget::MODULE_LIBRARY: { // Add shared library installation properties if this platform // supports them. @@ -146,8 +147,7 @@ void cmInstallTargetGenerator::GenerateScript(std::ostream& os) } break; case cmTarget::STATIC_LIBRARY: - case cmTarget::MODULE_LIBRARY: - // Nothing special for modules or static libraries. + // Nothing special for static libraries. break; default: break; |