diff options
Diffstat (limited to 'cmake/FindGn.cmake')
| -rw-r--r-- | cmake/FindGn.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cmake/FindGn.cmake b/cmake/FindGn.cmake index abfa0fe26..6bef6009e 100644 --- a/cmake/FindGn.cmake +++ b/cmake/FindGn.cmake @@ -1,10 +1,14 @@ -if (NOT DEFINED WEBENGINE_ROOT_BUILD_DIR) +if(NOT DEFINED WEBENGINE_ROOT_BUILD_DIR) set(WEBENGINE_ROOT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}) endif() find_program(Gn_EXECUTABLE NAMES gn PATHS "${WEBENGINE_ROOT_BUILD_DIR}/install/bin" NO_DEFAULT_PATH) if(NOT QT_HOST_PATH STREQUAL "") find_program(Gn_EXECUTABLE NAMES gn PATHS ${QT_HOST_PATH}/${INSTALL_LIBEXECDIR} NO_DEFAULT_PATH) endif() +# script mode does not have QT_HOST_PATH or INSTALL_LIBEXECDIR instead it uses QT_HOST_GN_PATH +if(NOT QT_HOST_GN_PATH STREQUAL "") + find_program(Gn_EXECUTABLE NAMES gn PATHS ${QT_HOST_GN_PATH} NO_DEFAULT_PATH) +endif() find_program(Gn_EXECUTABLE NAMES gn) if(Gn_EXECUTABLE) @@ -15,7 +19,7 @@ if(Gn_EXECUTABLE) OUTPUT_STRIP_TRAILING_WHITESPACE) endif() -string(REGEX MATCHALL "([1-9]\.[0-9]\.[0-9])\.qtwebengine\.qt\.io.*" Gn_QT_VERSION "${Gn_VERSION}") +string(REGEX MATCHALL "([1-9]\\.[0-9]\\.[0-9])\\.qtwebengine\\.qt\\.io.*" Gn_QT_VERSION "${Gn_VERSION}") if("${Gn_QT_VERSION}") set(Gn_VERSION "${Gn_QT_VERSION}") endif() @@ -31,7 +35,7 @@ find_package_handle_standard_args(Gn Gn_EXECUTABLE ) -if(Gn_FOUND AND NOT TARGET Gn::gn) +if(Gn_FOUND AND NOT TARGET Gn::gn AND NOT CMAKE_SCRIPT_MODE_FILE) add_executable(Gn::gn IMPORTED) set_property(TARGET Gn::gn PROPERTY IMPORTED_LOCATION ${Gn_EXECUTABLE}) endif() |