From e625255fe45336d187a3fbe273dc158049f326f6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 20 Sep 2023 12:29:20 -0400 Subject: Help: Indent find_package REGISTRY_VIEW paragraphs together In commit 8d7e80cf3d (find_* commands: add control over Windows registry views, 2022-04-16, v3.24.0-rc1~201^2) this indentation was used for the other find commands but was left out for `find_package`. --- Help/command/find_package.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index b0b6fe1..c3d8c42 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -346,7 +346,7 @@ that order). ``REGISTRY_VIEW`` can be specified to manage ``Windows`` registry queries specified as part of ``PATHS`` and ``HINTS``. -.. include:: FIND_XXX_REGISTRY_VIEW.txt + .. include:: FIND_XXX_REGISTRY_VIEW.txt If ``PATH_SUFFIXES`` is specified, the suffixes are appended to each (``W``) or (``U``) directory entry one-by-one. -- cgit v0.12 From 51c292781653b3fe7a64a535744aea0d59f11a6e Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 20 Sep 2023 12:44:00 -0400 Subject: Help: Clarify requirements for find_package to use lib{64,32,x32} paths Issue: #25157 --- Help/command/find_package.rst | 25 +++++++++++++++++-------- Help/variable/CMAKE_SIZEOF_VOID_P.rst | 4 ++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index c3d8c42..9a007fa 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -323,18 +323,27 @@ containing a configuration file: In all cases the ```` is treated as case-insensitive and corresponds to any of the names specified (```` or names given by ``NAMES``). -Paths with ``lib/`` are enabled if the -:variable:`CMAKE_LIBRARY_ARCHITECTURE` variable is set. ``lib*`` includes one -or more of the values ``lib64``, ``lib32``, ``libx32`` or ``lib`` (searched in -that order). +If at least one compiled language has been enabled, the architecture-specific +``lib/`` and ``lib*`` directories may be searched based on the compiler's +target architecture, in the following order: -* Paths with ``lib64`` are searched on 64 bit platforms if the +``lib/`` + Searched if the :variable:`CMAKE_LIBRARY_ARCHITECTURE` variable is set. + +``lib64`` + Searched on 64 bit platforms (:variable:`CMAKE_SIZEOF_VOID_P` is 8) and the :prop_gbl:`FIND_LIBRARY_USE_LIB64_PATHS` property is set to ``TRUE``. -* Paths with ``lib32`` are searched on 32 bit platforms if the + +``lib32`` + Searched on 32 bit platforms (:variable:`CMAKE_SIZEOF_VOID_P` is 4) and the :prop_gbl:`FIND_LIBRARY_USE_LIB32_PATHS` property is set to ``TRUE``. -* Paths with ``libx32`` are searched on platforms using the x32 ABI + +``libx32`` + Searched on platforms using the x32 ABI if the :prop_gbl:`FIND_LIBRARY_USE_LIBX32_PATHS` property is set to ``TRUE``. -* The ``lib`` path is always searched. + +``lib`` + Always searched. .. versionchanged:: 3.24 On ``Windows`` platform, it is possible to include registry queries as part diff --git a/Help/variable/CMAKE_SIZEOF_VOID_P.rst b/Help/variable/CMAKE_SIZEOF_VOID_P.rst index f5464d1..0c1fd7a 100644 --- a/Help/variable/CMAKE_SIZEOF_VOID_P.rst +++ b/Help/variable/CMAKE_SIZEOF_VOID_P.rst @@ -4,5 +4,5 @@ CMAKE_SIZEOF_VOID_P Size of a ``void`` pointer. This is set to the size of a pointer on the target machine, and is determined -by a try compile. If a 64-bit size is found, then the library search -path is modified to look for 64-bit libraries first. +when a compiled language is enabled. If a 64-bit size is found, then the +library search path is modified to look for 64-bit libraries first. -- cgit v0.12