diff options
| author | ruki <[email protected]> | 2017-07-19 09:42:52 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-07-19 09:42:52 +0800 |
| commit | 93ec0e112c5ccb4a2acd1ba5a36320218cd73c7e (patch) | |
| tree | 03f565e1764c53258ce51c35caa39cc9f895a29c /xmake/core/project | |
| parent | bfe4432515a8816edc1d32ccfe646096b3ff9c95 (diff) | |
fix option checking
Diffstat (limited to 'xmake/core/project')
| -rw-r--r-- | xmake/core/project/option.lua | 3 | ||||
| -rw-r--r-- | xmake/core/project/project.lua | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/xmake/core/project/option.lua b/xmake/core/project/option.lua index daee85a69..748ef03e5 100644 --- a/xmake/core/project/option.lua +++ b/xmake/core/project/option.lua @@ -112,6 +112,9 @@ function option:_cx_check() if results_or_errors then self:enable(true) end + else + -- no checked conditions, passed directly + self:enable(true) end end diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua index 14b9b7e7e..a6f2b6c4a 100644 --- a/xmake/core/project/project.lua +++ b/xmake/core/project/project.lua @@ -363,7 +363,7 @@ function project._load_targets() assert(interp) -- enter the project directory - local ok, errors = os.cd(project.directory()) + local ok, errors = os.cd(os.projectdir()) if not ok then return nil, errors end @@ -428,7 +428,7 @@ function project._load_options(disable_filter) assert(interp) -- enter the project directory - local ok, errors = os.cd(project.directory()) + local ok, errors = os.cd(os.projectdir()) if not ok then return nil, errors end |