2021-03-27 06:29:31 +01:00
|
|
|
Index: CMakeLists.txt
|
|
|
|
|
===================================================================
|
srcpkgs/f*: convert patches to -Np1
* fpc is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
2021-03-27 06:29:31 +01:00
|
|
|
@@ -432,13 +432,6 @@ if(MSVC)
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
-target_compile_options(freeorionparseobj
|
|
|
|
|
- PRIVATE
|
|
|
|
|
- $<$<CXX_COMPILER_ID:Clang>:-ftemplate-depth=512>
|
|
|
|
|
- $<$<CXX_COMPILER_ID:AppleClang>:-ftemplate-depth=512>
|
|
|
|
|
- $<$<AND:$<NOT:$<BOOL:${BUILD_TESTING}>>,$<CXX_COMPILER_ID:GNU>>:-O3>
|
|
|
|
|
-)
|
|
|
|
|
-
|
|
|
|
|
target_compile_definitions(freeorionparseobj
|
|
|
|
|
PUBLIC
|
|
|
|
|
-DBOOST_ALL_DYN_LINK
|
