mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Make patch-bullet__CMakeLists.txt suitable for upstream.

Browse Source
This commit is contained in:
Rene Ladan 2011-06-02 13:46:59 +00:00
parent 0c9a239913
commit 648262ce4d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=274977
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
math/ros-geometry/files/patch-bullet__CMakeLists.txt
View File

@ -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)