diff options
| -rw-r--r-- | libraries/sdformat/cmake.patch | 20 | ||||
| -rw-r--r-- | libraries/sdformat/sdformat.SlackBuild | 3 |
2 files changed, 23 insertions, 0 deletions
diff --git a/libraries/sdformat/cmake.patch b/libraries/sdformat/cmake.patch new file mode 100644 index 000000000000..38e6b6cca6b3 --- /dev/null +++ b/libraries/sdformat/cmake.patch @@ -0,0 +1,20 @@ +diff -Naur osrf-sdformat-e5ac5aaa49f2.orig/CMakeLists.txt osrf-sdformat-e5ac5aaa49f2/CMakeLists.txt +--- osrf-sdformat-e5ac5aaa49f2.orig/CMakeLists.txt 2016-10-10 23:51:37.000000000 +0200 ++++ osrf-sdformat-e5ac5aaa49f2/CMakeLists.txt 2017-07-29 19:46:16.021921859 +0200 +@@ -186,11 +186,13 @@ + # OS Specific initialization + if (UNIX) + sdf_setup_unix() +-else (WIN32) ++endif () ++if (WIN32) + sdf_setup_windows() +-else (APPLE) ++endif () ++if (APPLE) + sdf_setup_apple() +-endif() ++endif () + + ################################################# + # Print warnings and errors diff --git a/libraries/sdformat/sdformat.SlackBuild b/libraries/sdformat/sdformat.SlackBuild index 5dea256ef610..b412d5a10dbd 100644 --- a/libraries/sdformat/sdformat.SlackBuild +++ b/libraries/sdformat/sdformat.SlackBuild @@ -71,6 +71,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Patch for cmake >= 3.9.x +patch -p1 < $CWD/cmake.patch + mkdir -p build cd build cmake \ |