diff options
| author | ruki <[email protected]> | 2020-09-07 23:06:06 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-09-07 23:06:06 +0800 |
| commit | 84085d03b29fcb17ef93f6e8e367b21488904f6e (patch) | |
| tree | 9d1abfc48e67dd9d0ba9c52fc6b1edbda621aff1 | |
| parent | 219a220ae31f482fdc95a21f1a479709d562c6cd (diff) | |
add system name for cmake
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/private/action/trybuild/cmake.lua | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 0ee40f4dd..81df10d5d 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -72,7 +72,6 @@ function _get_configs_for_iphoneos(package, configs) envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "ONLY" envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "ONLY" envs.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "NEVER" - envs.CMAKE_OSX_SYSROOT = "" for k, v in pairs(envs) do table.insert(configs, "-D" .. k .. "=" .. v) end @@ -130,6 +129,7 @@ function _get_configs_for_cross(package, configs) envs.CMAKE_STATIC_LINKER_FLAGS = table.concat(table.wrap(package:build_getenv("arflags")), ' ') envs.CMAKE_EXE_LINKER_FLAGS = table.concat(table.wrap(package:build_getenv("ldflags")), ' ') envs.CMAKE_SHARED_LINKER_FLAGS = table.concat(table.wrap(package:build_getenv("shflags")), ' ') + envs.CMAKE_SYSTEM_NAME = "Linux" -- avoid find and add system include/library path envs.CMAKE_FIND_ROOT_PATH = sdkdir envs.CMAKE_SYSROOT = sdkdir diff --git a/xmake/modules/private/action/trybuild/cmake.lua b/xmake/modules/private/action/trybuild/cmake.lua index b6a899577..0fba5281f 100644 --- a/xmake/modules/private/action/trybuild/cmake.lua +++ b/xmake/modules/private/action/trybuild/cmake.lua @@ -81,10 +81,10 @@ function _get_configs_for_iphoneos(configs) envs.CMAKE_STATIC_LINKER_FLAGS = table.concat(table.wrap(_get_buildenv("arflags")), ' ') envs.CMAKE_EXE_LINKER_FLAGS = table.concat(table.wrap(_get_buildenv("ldflags")), ' ') envs.CMAKE_SHARED_LINKER_FLAGS = table.concat(table.wrap(_get_buildenv("shflags")), ' ') + envs.CMAKE_SYSTEM_NAME = "iOS" envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "ONLY" envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "ONLY" envs.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "NEVER" - envs.CMAKE_OSX_SYSROOT = "" for k, v in pairs(envs) do table.insert(configs, "-D" .. k .. "=" .. v) end @@ -142,6 +142,7 @@ function _get_configs_for_cross(configs) envs.CMAKE_STATIC_LINKER_FLAGS = table.concat(table.wrap(_get_buildenv("arflags")), ' ') envs.CMAKE_EXE_LINKER_FLAGS = table.concat(table.wrap(_get_buildenv("ldflags")), ' ') envs.CMAKE_SHARED_LINKER_FLAGS = table.concat(table.wrap(_get_buildenv("shflags")), ' ') + envs.CMAKE_SYSTEM_NAME = "Linux" -- avoid find and add system include/library path envs.CMAKE_FIND_ROOT_PATH = sdkdir envs.CMAKE_SYSROOT = sdkdir |