diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-01-22 18:02:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-22 18:02:02 +0100 |
| commit | 63e67468b45edcc899de24a1940985bccf68f66a (patch) | |
| tree | b8c8c5a7694ea7d98b1404d67a9d5b1492ec1071 /cmake.deps/cmake/BuildLuv.cmake | |
| parent | 151b9fc52e3cd69b386eb2dc4e5a0d179667190b (diff) | |
| download | rneovim-63e67468b45edcc899de24a1940985bccf68f66a.tar.gz rneovim-63e67468b45edcc899de24a1940985bccf68f66a.tar.bz2 rneovim-63e67468b45edcc899de24a1940985bccf68f66a.zip | |
build: use CMAKE_POSITION_INDEPENDENT_CODE instead of -fPIC (#21947)
It's simpler to let cmake figure out what flags to add to each platforms
to create position independent code rather than handling it ourselves.
Also remove code that sets POSITION_INDEPENDENT_CODE property on SHARED
and MODULE libraries, as it's already on by default.
Diffstat (limited to 'cmake.deps/cmake/BuildLuv.cmake')
| -rw-r--r-- | cmake.deps/cmake/BuildLuv.cmake | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/cmake.deps/cmake/BuildLuv.cmake b/cmake.deps/cmake/BuildLuv.cmake index c37a870b3d..ec0707020a 100644 --- a/cmake.deps/cmake/BuildLuv.cmake +++ b/cmake.deps/cmake/BuildLuv.cmake @@ -12,7 +12,8 @@ set(LUV_CMAKE_ARGS -DWITH_SHARED_LIBUV=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON - -DBUILD_MODULE=OFF) + -DBUILD_MODULE=OFF + -DCMAKE_POSITION_INDEPENDENT_CODE=ON) if(USE_BUNDLED_LUAJIT) list(APPEND LUV_CMAKE_ARGS -DWITH_LUA_ENGINE=LuaJit) @@ -33,16 +34,11 @@ if(USE_BUNDLED_LIBUV) -DLIBUV_LIBRARIES=uv_a) endif() -if(MSVC) - list(APPEND LUV_CMAKE_ARGS - "-DCMAKE_C_FLAGS:STRING=${LUV_INCLUDE_FLAGS}") -else() - list(APPEND LUV_CMAKE_ARGS - "-DCMAKE_C_FLAGS:STRING=${LUV_INCLUDE_FLAGS} -fPIC") - if(CMAKE_GENERATOR MATCHES "Unix Makefiles" AND - (CMAKE_SYSTEM_NAME MATCHES ".*BSD" OR CMAKE_SYSTEM_NAME MATCHES "DragonFly")) - list(APPEND LUV_CMAKE_ARGS -DCMAKE_MAKE_PROGRAM=gmake) - endif() +list(APPEND LUV_CMAKE_ARGS + "-DCMAKE_C_FLAGS:STRING=${LUV_INCLUDE_FLAGS}") +if(CMAKE_GENERATOR MATCHES "Unix Makefiles" AND + (CMAKE_SYSTEM_NAME MATCHES ".*BSD" OR CMAKE_SYSTEM_NAME MATCHES "DragonFly")) + list(APPEND LUV_CMAKE_ARGS -DCMAKE_MAKE_PROGRAM=gmake) endif() if(USE_EXISTING_SRC_DIR) |