Revision: 40538
http://brlcad.svn.sourceforge.net/brlcad/?rev=40538&view=rev
Author: starseeker
Date: 2010-09-10 23:41:59 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
Get benchmark running - needed a slightly different target definition.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/bench/CMakeLists.txt
brlcad/branches/cmake/sh/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-10 21:52:01 UTC (rev
40537)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-10 23:41:59 UTC (rev
40538)
@@ -314,13 +314,13 @@
# The location in which to install BRL-CAD data files
IF(NOT BRLCAD_INSTALL_DATA_DIR)
IF (${BRLCAD_PREFIX} MATCHES "^/usr[/]*$")
- SET(BRLCAD_INSTALL_DATA_DIR
${BRLCAD_PREFIX}/share/brlcad/${BRLCAD_VERSION})
+ SET(BRLCAD_INSTALL_DATA_DIR ${BRLCAD_PREFIX}/share/brlcad)
ENDIF()
IF (${BRLCAD_PREFIX} MATCHES "^/usr/local[/]*$")
- SET(BRLCAD_INSTALL_DATA_DIR
${BRLCAD_PREFIX}/share/brlcad/${BRLCAD_VERSION})
+ SET(BRLCAD_INSTALL_DATA_DIR ${BRLCAD_PREFIX}/share/brlcad)
ENDIF()
IF(NOT BRLCAD_INSTALL_DATA_DIR)
- SET(BRLCAD_INSTALL_DATA_DIR
${BRLCAD_PREFIX}/share/${BRLCAD_VERSION})
+ SET(BRLCAD_INSTALL_DATA_DIR ${BRLCAD_PREFIX}/share)
ENDIF()
ENDIF(NOT BRLCAD_INSTALL_DATA_DIR)
Modified: brlcad/branches/cmake/bench/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/bench/CMakeLists.txt 2010-09-10 21:52:01 UTC (rev
40537)
+++ brlcad/branches/cmake/bench/CMakeLists.txt 2010-09-10 23:41:59 UTC (rev
40538)
@@ -10,8 +10,8 @@
BRLCAD_ADDEXEC(pixcmp pixcmp.c bu)
-configure_file(run.sh ${CMAKE_CURRENT_BINARY_DIR}/benchmark COPYONLY)
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/benchmark DESTINATION
${BRLCAD_INSTALL_BIN_DIR})
+configure_file(run.sh ${CMAKE_BINARY_DIR}/bin/benchmark COPYONLY)
+INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/bin/benchmark DESTINATION
${BRLCAD_INSTALL_BIN_DIR})
SET(bench_MANS
benchmark.1
@@ -20,16 +20,17 @@
install(FILES ${bench_MANS} DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man1)
IF(SH_EXEC)
-ADD_CUSTOM_COMMAND(TARGET benchmark
- COMMAND ${SH_EXEC} ${CMAKE_CURRENT_SOURCE_DIR}/run.sh run
- DEPENDS rt bldg391.g m35.g moss.g sphflake.g star.g world.g
- )
-ADD_CUSTOM_COMMAND(TARGET benchmark-clean
- COMMAND ${SH_EXEC} ${CMAKE_CURRENT_SOURCE_DIR}/run.sh clean
- DEPENDS rt bldg391.g m35.g moss.g sphflake.g star.g world.g
- )
-ADD_CUSTOM_COMMAND(TARGET benchmark-clobber
- COMMAND ${SH_EXEC} ${CMAKE_CURRENT_SOURCE_DIR}/run.sh clobber
- DEPENDS rt bldg391.g m35.g moss.g sphflake.g star.g world.g
- )
+ ADD_CUSTOM_TARGET(benchmark
+ ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark run
+ 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
+ )
+ ADD_CUSTOM_TARGET(benchmark-clobber
+ ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark clobber
+ DEPENDS rt
+ )
ENDIF(SH_EXEC)
Modified: brlcad/branches/cmake/sh/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/sh/CMakeLists.txt 2010-09-10 21:52:01 UTC (rev
40537)
+++ brlcad/branches/cmake/sh/CMakeLists.txt 2010-09-10 23:41:59 UTC (rev
40538)
@@ -13,7 +13,11 @@
show.sh
tracker.sh
trimconfig.sh
-)
+ )
+FOREACH(script ${sh_SCRIPTS})
+ configure_file(${script} ${CMAKE_BINARY_DIR}/bin/${script} COPYONLY)
+ENDFOREACH(script ${sh_SCRIPTS})
+
INSTALL(PROGRAMS ${sh_SCRIPTS} DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
SET(noinst_SCRIPTS
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
