merged develop

conan-io · Jan 25, 2022 · db253fe · db253fe
2 parents f7f0605 + 1940331
commit db253fe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/conan/tools/cmake/cmakedeps/templates/macros.py b/conan/tools/cmake/cmakedeps/templates/macros.py
@@ -28,7 +28,7 @@ def template(self):
         return textwrap.dedent("""
         function(conan_message MESSAGE_TYPE MESSAGE_CONTENT)
             if(NOT CONAN_CMAKE_SILENT_OUTPUT)
-                message(${MESSAGE_TYPE} ${MESSAGE_CONTENT})
+                message(${MESSAGE_TYPE} "${MESSAGE_CONTENT}")
             endif()
         endfunction()
 
@@ -39,9 +39,9 @@ def template(self):
                    find_library(CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND NAMES ${_FRAMEWORK} PATHS ${FRAMEWORKS_DIRS} CMAKE_FIND_ROOT_PATH_BOTH)
                    if(CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND)
                        list(APPEND ${FRAMEWORKS_FOUND} ${CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND})
-                       message("Framework found! ${FRAMEWORKS_FOUND}")
+                       conan_message(DEBUG "Framework found! ${FRAMEWORKS_FOUND}")
                    else()
-                       message(FATAL_ERROR "Framework library ${_FRAMEWORK} not found in paths: ${FRAMEWORKS_DIRS}")
+                       conan_message(FATAL_ERROR "Framework library ${_FRAMEWORK} not found in paths: ${FRAMEWORKS_DIRS}")
                    endif()
                endforeach()
            endif()

diff --git a/conan/tools/cmake/toolchain.py b/conan/tools/cmake/toolchain.py
@@ -96,6 +96,7 @@ class VSRuntimeBlock(Block):
             {% set genexpr.str = genexpr.str +
                                   '$<$<CONFIG:' + config + '>:' + value|string + '>' %}
         {% endfor %}
+        set(CMAKE_POLICY_DEFAULT_CMP0091 NEW)
         set(CMAKE_MSVC_RUNTIME_LIBRARY "{{ genexpr.str }}")
         """)
 
@@ -763,6 +764,10 @@ class CMakeToolchain(object):
             message("Using Conan toolchain: ${CMAKE_TOOLCHAIN_FILE}.")
         endif()
 
+        if(${CMAKE_VERSION} VERSION_LESS "3.15")
+            message(FATAL_ERROR "The 'CMakeToolchain' generator only works with CMake >= 3.15")
+        endif()
+
         {% for conan_block in conan_blocks %}
         {{ conan_block }}
         {% endfor %}

diff --git a/conan/tools/gnu/__init__.py b/conan/tools/gnu/__init__.py
@@ -1,4 +1,5 @@
+from conan.tools.gnu.autotools import Autotools
 from conan.tools.gnu.autotoolstoolchain import AutotoolsToolchain
 from conan.tools.gnu.autotoolsdeps import AutotoolsDeps
-from conan.tools.gnu.autotools import Autotools
-from conan.tools.gnu.pkgconfigdeps.pkgconfigdeps import PkgConfigDeps
+from conan.tools.gnu.pkgconfig import PkgConfig
+from conan.tools.gnu.pkgconfigdeps import PkgConfigDeps
diff --git a/conan/tools/gnu/pkgconfigdeps/__init__.py b/conan/tools/gnu/pkgconfigdeps/__init__.py
@@ -0,0 +1 @@
+from conan.tools.gnu.pkgconfigdeps.pkgconfigdeps import PkgConfigDeps