diff options
| -rw-r--r-- | Help/command/target_link_libraries.rst | 6 | ||||
| -rw-r--r-- | Modules/FindBoost.cmake | 2 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/cmServerConnection.cxx | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/Help/command/target_link_libraries.rst b/Help/command/target_link_libraries.rst index d903d05..90b6575 100644 --- a/Help/command/target_link_libraries.rst +++ b/Help/command/target_link_libraries.rst @@ -62,6 +62,12 @@ Each ``<item>`` may be: dependencies, so they are generally safe to specify only as private link items that will not propagate to dependents. + Link flags specified here are inserted into the link command in the same + place as the link libraries. This might not be correct, depending on + the linker. Use the :prop_tgt:`LINK_FLAGS` target property to add link + flags explicitly. The flags will then be placed at the toolchain-defined + flag position in the link command. + * A ``debug``, ``optimized``, or ``general`` keyword immediately followed by another ``<item>``. The item following such a keyword will be used only for the corresponding build configuration. The ``debug`` keyword diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index a66aa8f..184fb05 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -944,7 +944,7 @@ else() # _Boost_COMPONENT_HEADERS. See the instructions at the top of # _Boost_COMPONENT_DEPENDENCIES. set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} - "1.61.0" "1.61" "1.60.0" "1.60" + "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55" "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51" "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1" diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3e27338..51a0fff 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 20161001) +set(CMake_VERSION_PATCH 20161003) #set(CMake_VERSION_RC 1) diff --git a/Source/cmServerConnection.cxx b/Source/cmServerConnection.cxx index c62ca3c..c9822d3 100644 --- a/Source/cmServerConnection.cxx +++ b/Source/cmServerConnection.cxx @@ -164,6 +164,7 @@ void cmServerConnection::ReadData(const std::string& data) void cmServerConnection::HandleEof() { + this->FileMonitor()->StopMonitoring(); this->TearDown(); } |