améliore options cmake MAKE_PREFIX_PATH et MAKE_INCLUDE... ・ 0f63128 ・ Gitprep

+2 -2

flightgear/fgfs_function

@@ -56,8 +56,8 @@ function fgfs () {
                         local cmake_options=("-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=$fgfs_install/$component")
                         test -e $fgfs_source/${component}.specific && source $fgfs_source/${component}.specific
                         if test ${#previously_installed[@]} -gt 0; then
-                            cmake_options+=(${(j. .)${:--DCMAKE_PREFIX_PATH=$fgfs_install/${^previously_installed}}})
-                            cmake_options+=(${(j. .)${:--DCMAKE_INCLUDE_PATH=$fgfs_install/${^previously_installed}/include}})
+                            cmake_options+=(-DCMAKE_PREFIX_PATH=\"${(j.;.)${:-$fgfs_install/${^previously_installed}}}\")
+                            cmake_options+=(-DCMAKE_INCLUDE_PATH=\"${(j.;.)${:-$fgfs_install/${^previously_installed}}}\")
                         fi
 
                         title="*** ${component:u}${branch:+ [$branch]} ***"

...	...	@@ -56,8 +56,8 @@ function fgfs () {
56	56	local cmake_options=("-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=$fgfs_install/$component")
57	57	test -e $fgfs_source/${component}.specific && source $fgfs_source/${component}.specific
58	58	if test ${#previously_installed[@]} -gt 0; then
59		- cmake_options+=(${(j. .)${:--DCMAKE_PREFIX_PATH=$fgfs_install/${^previously_installed}}})
60		- cmake_options+=(${(j. .)${:--DCMAKE_INCLUDE_PATH=$fgfs_install/${^previously_installed}/include}})
	59	+ cmake_options+=(-DCMAKE_PREFIX_PATH=\"${(j.;.)${:-$fgfs_install/${^previously_installed}}}\")
	60	+ cmake_options+=(-DCMAKE_INCLUDE_PATH=\"${(j.;.)${:-$fgfs_install/${^previously_installed}}}\")
61	61	fi
62	62
63	63	title="* ${component:u}${branch:+ [$branch]} *"