Revision: 40541
http://brlcad.svn.sourceforge.net/brlcad/?rev=40541&view=rev
Author: starseeker
Date: 2010-09-11 00:20:54 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
Taking a stab at Brad King's workaround for clean not accepting dependencies,
but in early testing on OSX it doesn't seem to work.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/bench/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-10 23:52:52 UTC (rev
40540)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-11 00:20:54 UTC (rev
40541)
@@ -85,6 +85,14 @@
# previous runs
SET(CMAKE_INSTALL_PREFIX "")
+# This is a tentative workaround for the current inability of
+# CMake to accept dependencies to "make clean" targets - examples
+# include the bench directory.
+if("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
+ set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)
+ set(USE_SUBDIR_TARGETS 1)
+endif("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
+
# This file contains the top level CMakeLists.txt logic for the
# BRL-CAD software package.
# Minimum required version of CMake
Modified: brlcad/branches/cmake/bench/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/bench/CMakeLists.txt 2010-09-10 23:52:52 UTC (rev
40540)
+++ brlcad/branches/cmake/bench/CMakeLists.txt 2010-09-11 00:20:54 UTC (rev
40541)
@@ -25,10 +25,17 @@
DEPENDS rt
)
ADD_DEPENDENCIES(benchmark bldg391.g m35.g moss.g sphflake.g star.g
world.g)
- ADD_CUSTOM_TARGET(benchmark-clean
- ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark clean
- DEPENDS rt
- )
+ IF(USE_SUBDIR_TARGETS)
+ ADD_CUSTOM_TARGET(clean
+ ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark clean
+ DEPENDS rt
+ )
+ ELSE(USE_SUBDIR_TARGETS)
+ ADD_CUSTOM_TARGET(benchmark-clean
+ ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark clean
+ DEPENDS rt
+ )
+ ENDIF(USE_SUBDIR_TARGETS)
ADD_CUSTOM_TARGET(benchmark-clobber
${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark clobber
DEPENDS rt
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
