Skip to content

Commit 6a930c5

Browse files
committed
Merge pull request 'Fix build for linux' (#100) from fix/iwork-build into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/100
2 parents 09b4ab5 + 6c0715c commit 6a930c5

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

Common/3dParty/apple/fetch.py

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,16 @@
1313

1414
#the linux code uses an implementation for c++ 17, so we just put this implementation
1515
if ("linux" == base.host_platform()):
16-
base.replaceInFile("./mdds/include/mdds/global.hpp", "namespace mdds {", "namespace std { template<bool __v> using bool_constant = integral_constant<bool, __v>; }\n\nnamespace mdds {")
16+
linux_cpp_version = "#if __cplusplus < 201402L\n"
17+
linux_cpp_version += "namespace std {\n"
18+
linux_cpp_version += " template<bool __v>\n"
19+
linux_cpp_version += " using bool_constant = integral_constant<bool, __v>;\n\n"
20+
linux_cpp_version += " template <class... _Types>\n"
21+
linux_cpp_version += " using void_t = void;\n"
22+
linux_cpp_version += "}\n #endif\n\n"
23+
linux_cpp_version += "namespace mdds {"
24+
25+
base.replaceInFile("./mdds/include/mdds/global.hpp", "namespace mdds {", linux_cpp_version)
1726

1827
if not base.is_dir("librevenge"):
1928
base.cmd("git", ["clone", "https://github.com/Distrotech/librevenge.git"])

Common/3dParty/apple/module.version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2

0 commit comments

Comments
 (0)