From 348e68e9dfb9cea27c8d5e5573f25f90ccb5042e Mon Sep 17 00:00:00 2001 From: Erik Boasson Date: Thu, 27 Jun 2019 11:07:48 +0200 Subject: [PATCH] Update FindMaven for Travis/Windows It appears the Chocolately maven package now installs in different location (or some shims that used to be installed no longer are). Because the Travis build uses bash instead of cmd/powershell it doesn't properly pick up M2_HOME. This commits adds the new location. Signed-off-by: Erik Boasson --- src/cmake/modules/FindMaven.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/cmake/modules/FindMaven.cmake b/src/cmake/modules/FindMaven.cmake index 5a2e3c3..02d2dbd 100644 --- a/src/cmake/modules/FindMaven.cmake +++ b/src/cmake/modules/FindMaven.cmake @@ -18,8 +18,13 @@ if(DEFINED ENV{M2_HOME}) endif() # Chocolatey installs packages under C:\ProgramData\chocolatey. -if(ENV{ProgramData} AND IS_DIRECTORY "$ENV{ProgramData}/chocolatey/bin") - list(APPEND _mvn_paths "$ENV{ProgramData}/chocolatey/bin") +if(NOT "$ENV{ProgramData}" STREQUAL "") + if(IS_DIRECTORY "$ENV{ProgramData}/chocolatey/bin") + list(APPEND _mvn_paths "$ENV{ProgramData}/chocolatey/bin") + endif() + if(IS_DIRECTORY "$ENV{ProgramData}/chocolatey/bin") + list(APPEND _dirs "$ENV{ProgramData}/chocolatey/lib/maven") + endif() endif() # Maven documentation mentions intalling maven under C:\Program Files on