diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2011-06-02 13:46:59 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2011-06-02 13:46:59 +0000 |
| commit | 648262ce4d64a990ce45d2bce8541513eee1a6cf (patch) | |
| tree | b4c7844ef56ecdaf43d2920268a95b2bf2591f2a | |
| parent | 0c9a239913fc72d738f46ec165318cbb21027f1f (diff) | |
| download | ports-648262ce4d64a990ce45d2bce8541513eee1a6cf.tar.gz ports-648262ce4d64a990ce45d2bce8541513eee1a6cf.zip | |
Notes
| -rw-r--r-- | math/ros-geometry/files/patch-bullet__CMakeLists.txt | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/math/ros-geometry/files/patch-bullet__CMakeLists.txt b/math/ros-geometry/files/patch-bullet__CMakeLists.txt index 2e776d3577eb..f36e5323b5de 100644 --- a/math/ros-geometry/files/patch-bullet__CMakeLists.txt +++ b/math/ros-geometry/files/patch-bullet__CMakeLists.txt @@ -1,22 +1,19 @@ ---- bullet/CMakeLists.txt.orig 2011-02-15 01:41:02.000000000 +0100 -+++ bullet/CMakeLists.txt 2011-05-26 00:00:27.000000000 +0200 -@@ -8,13 +8,14 @@ +--- bullet/CMakeLists.txt.orig 2011-05-27 19:54:24.000000000 +0200 ++++ bullet/CMakeLists.txt 2011-06-02 14:49:35.000000000 +0200 +@@ -8,13 +8,13 @@ MAKE_DIRECTORY(${PROJECT_SOURCE_DIR}/src/) # Build Bullet -if($ENV{MAKE}) -+#if($ENV{MAKE}) ++if(NOT "$ENV{MAKE}" STREQUAL "") execute_process(COMMAND cmake -E chdir ${PROJECT_SOURCE_DIR} $ENV{MAKE} -f Makefile.bullet RESULT_VARIABLE _make_failed) -else($ENV{MAKE}) --execute_process(COMMAND cmake -E chdir ${PROJECT_SOURCE_DIR} make -f Makefile.bullet -- RESULT_VARIABLE _make_failed) ++else(NOT "$ENV{MAKE}" STREQUAL "") + execute_process(COMMAND cmake -E chdir ${PROJECT_SOURCE_DIR} make -f Makefile.bullet + RESULT_VARIABLE _make_failed) -endif($ENV{MAKE}) -+#else($ENV{MAKE}) -+#message(FATAL_ERROR "no env, bullet: " $ENV{MAKE}) -+#execute_process(COMMAND cmake -E chdir ${PROJECT_SOURCE_DIR} make -f Makefile.bullet -+# RESULT_VARIABLE _make_failed) -+#endif($ENV{MAKE}) ++endif(NOT "$$ENV{MAKE}" STREQUAL "") if(_make_failed) message(FATAL_ERROR "Build of Bullet failed") endif(_make_failed) |