Commit bc827cc8 authored by Abderrahim Kitouni's avatar Abderrahim Kitouni Committed by Valentin David
Browse files

plugins/elements/cmake.yaml: always specify variable types 

cmake sometimes misinterprets relative paths as relative to the current directory
if this is not specified. See freedesktop-sdk/freedesktop-sdk#431

adjust tests/format/variables.py accordingly.
parent 9f629638

buildstream/plugins/elements/cmake.yaml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ variables: 
  cmake-args: |



    -DCMAKE_INSTALL_PREFIX:PATH="%{prefix}" \

    -DCMAKE_INSTALL_LIBDIR=%{lib} %{cmake-extra} %{cmake-global} %{cmake-local}

    -DCMAKE_INSTALL_LIBDIR:PATH="%{lib}" %{cmake-extra} %{cmake-global} %{cmake-local}



  cmake: |

tests/format/variables.py

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ DATA_DIR = os.path.join( 
    ('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/buildstream-install\" install"),

    ('cmake.bst', 'cmake',

     "cmake -B_builddir -H\".\" -G\"Unix Makefiles\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" +

     "-DCMAKE_INSTALL_LIBDIR=lib   "),

     "-DCMAKE_INSTALL_LIBDIR:PATH=\"lib\"   "),

    ('distutils.bst', 'python-install',

     "python3 ./setup.py install --prefix \"/usr\" \\\n" +

     "--root \"/buildstream-install\""),
@@ -46,7 +46,7 @@ def test_defaults(cli, datafiles, tmpdir, target, varname, expected): 
    ('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/custom/install/root\" install"),

    ('cmake.bst', 'cmake',

     "cmake -B_builddir -H\".\" -G\"Ninja\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" +

     "-DCMAKE_INSTALL_LIBDIR=lib   "),

     "-DCMAKE_INSTALL_LIBDIR:PATH=\"lib\"   "),

    ('distutils.bst', 'python-install',

     "python3 ./setup.py install --prefix \"/opt\" \\\n" +

     "--root \"/custom/install/root\""),