diff options
| author | ruki <[email protected]> | 2019-04-12 00:38:36 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-04-11 21:51:36 +0800 |
| commit | 4572f4895e11712ba620097cb504195abc060df2 (patch) | |
| tree | 2743306a9f2802b0933a64adc150902607003f10 | |
| parent | f4781b3cbc4d8e61eddb888ea4e7d258adc70c5b (diff) | |
improve find_qt
| -rw-r--r-- | xmake/modules/detect/sdks/find_qt.lua | 1 | ||||
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua index 2276529df..5f3c6f9a1 100644 --- a/xmake/modules/detect/sdks/find_qt.lua +++ b/xmake/modules/detect/sdks/find_qt.lua @@ -53,6 +53,7 @@ function _find_sdkdir(sdkdir, sdkver) table.insert(subdirs, path.join(sdkver or "*", "android_*", "bin")) end table.insert(subdirs, path.join(sdkver or "*", "*", "bin")) + table.insert(subdirs, path.join("*", "bin")) -- init the search directories local pathes = {} diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 1f3ebaea7..a10e09c59 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -93,8 +93,9 @@ end function install(package, configs) -- enter build directory - os.mkdir("build/install") - local oldir = os.cd("build") + local buildir = "build_" .. hash.uuid():split('%-')[1] + os.mkdir(path.join(buildir, "install")) + local oldir = os.cd(buildir) -- init arguments local argv = {"-DCMAKE_INSTALL_PREFIX=" .. path.absolute("install")} |