This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 42f2920bce6df86e0e21a8de85e33a1795e9eff5 Author: Chris McFarlen <[email protected]> AuthorDate: Tue Mar 11 11:51:42 2025 -0500 Move defaulting install prefix before layout setup (#12085) Co-authored-by: Chris McFarlen <[email protected]> (cherry picked from commit 9a1ef119f3b7a017583c9aa5d088b2437101b92a) --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e691ab2c94..6b8d3856f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,6 +45,14 @@ set(CMAKE_CXX_EXTENSIONS OFF) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE -DATS_BUILD) +# Setup default install directory +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX + /usr/local/trafficserver + CACHE PATH "Default install path" FORCE + ) +endif() + include(layout) include(ClangTidy) @@ -161,14 +169,6 @@ else() endif() set(TS_PKGSYSUSER ${WITH_USER}) -# Setup default install directory -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX - /usr/local/trafficserver - CACHE PATH "Default install path" FORCE - ) -endif() - if(CMAKE_SYSTEM_NAME STREQUAL Linux) set(DEFAULT_POSIX_CAP ON) endif()
