diff options
| author | ruki <[email protected]> | 2022-08-20 00:44:24 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-08-20 00:44:24 +0800 |
| commit | 4ac92cbf6c5f0344ae20d80ac1261b19ed4553d0 (patch) | |
| tree | 8503f051e22d9c14f523da2e51c3a8b22000d44b | |
| parent | e6c8d8c5c8bed2cae7830dec39e60382d7dd1464 (diff) | |
improve cmakelists
| -rw-r--r-- | tests/projects/package/conan/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/plugins/project/cmake/cmakelists.lua | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/projects/package/conan/xmake.lua b/tests/projects/package/conan/xmake.lua index 69f7d2052..3021fab7c 100644 --- a/tests/projects/package/conan/xmake.lua +++ b/tests/projects/package/conan/xmake.lua @@ -1,5 +1,5 @@ -add_requires("conan::zlib/1.2.11", {alias = "zlib", debug = true}) -add_requires("conan::openssl/1.1.1g", {alias = "openssl", +add_requires("conan::zlib 1.2.11", {alias = "zlib", debug = true}) +add_requires("conan::openssl 1.1.1g", {alias = "openssl", configs = {options = "OpenSSL:shared=True"}}) target("test") diff --git a/xmake/plugins/project/cmake/cmakelists.lua b/xmake/plugins/project/cmake/cmakelists.lua index 55b3fba01..210c3205f 100644 --- a/xmake/plugins/project/cmake/cmakelists.lua +++ b/xmake/plugins/project/cmake/cmakelists.lua @@ -246,8 +246,9 @@ function _set_target_compiler(cmakelists, target) name = name:gsub("clang%-", "clang++-") name = name:gsub("gcc$", "g++") name = name:gsub("gcc%-", "g++-") - cxx = path.join(dir, name):gsub("\\", "/") + cxx = path.join(dir, name) end + cxx = cxx:gsub("\\", "/") cmakelists:print("set(CMAKE_CXX_COMPILER \"%s\")", cxx) end end |