Mercurial > vanilla
view dev/cmake/patch-fhs.patch @ 766:e91fbcb3d1ef
vanilla: consolidate FHS
author | David Demelier <markand@malikania.fr> |
---|---|
date | Fri, 09 Aug 2019 20:10:00 +0200 |
parents | |
children | e67c258b3b1a |
line wrap: on
line source
--- Modules/Platform/UnixPaths.cmake.orig 2019-08-09 10:02:27.447007587 +0200 +++ Modules/Platform/UnixPaths.cmake 2019-08-09 10:04:02.843010517 +0200 @@ -23,7 +23,7 @@ # search types. list(APPEND CMAKE_SYSTEM_PREFIX_PATH # Standard - /usr/local /usr / + /local / # CMake install location "${_CMAKE_INSTALL_DIR}" @@ -41,39 +41,32 @@ endif() endif() -# Non "standard" but common install prefixes -list(APPEND CMAKE_SYSTEM_PREFIX_PATH - /usr/X11R6 - /usr/pkg - /opt - ) - # List common include file locations not under the common prefixes. list(APPEND CMAKE_SYSTEM_INCLUDE_PATH # X11 - /usr/include/X11 + /include/X11 ) list(APPEND CMAKE_SYSTEM_LIBRARY_PATH # X11 - /usr/lib/X11 + /lib/X11 ) list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 + /lib ) list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include + /include ) list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include + /include ) list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include + /include ) # Enable use of lib32 and lib64 search path variants by default. -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS TRUE) -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE) -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS TRUE) +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE) +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS FALSE)