Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update premake generator #1034

Merged
merged 5 commits into from Jan 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion integrations/premake.rst
Expand Up @@ -55,7 +55,7 @@ In order to use new generator within your project, use the following Premake scr

-- premake5.lua

include("conanbuildinfo.lua")
include("conanbuildinfo.premake.lua")

workspace("ConanPremakeDemo")
conan_basic_setup()
Expand Down
15 changes: 10 additions & 5 deletions reference/generators/premake.rst
Expand Up @@ -4,15 +4,20 @@

.. _premake_generator:

`premake` [EXPERIMENTAL]
========================
premake
=======

.. warning::

This is an **experimental** feature subject to breaking changes in future releases.

.. container:: out_reference_box

This is the reference page for ``premake`` generator.
Go to :ref:`Integrations/premake<premake>` if you want to learn how to integrate your project or recipes with premake.

Generates a file name ``conanbuildinfo.premake.lua`` that can be used for your premake builds (both premake 4 and premake 5 are supported).
Generates a file name *conanbuildinfo.premake.lua* that can be used for your premake builds (both premake 4 and premake 5 are supported).

The file contains:

- N groups of variables, one group per require, declaring the same individual values: include dirs, libs, bin dirs, defines, etc.
Expand All @@ -25,8 +30,8 @@ Variables
Package declared variables
++++++++++++++++++++++++++

For each requirement ``conanbuildinfo.premake.lua`` file declares the following variables.
```XXX``` is the name of the require. e.g. "zlib" for ``zlib/1.2.11@lasote/stable`` requirement:
For each requirement *conanbuildinfo.premake.lua* file declares the following variables.
``XXX`` is the name of the require. e.g. "zlib" for ``zlib/1.2.11@lasote/stable`` requirement:

+---------------------------+------------------------------------------------------+
| NAME | VALUE |
Expand Down