Revision: 56401
http://sourceforge.net/p/brlcad/code/56401
Author: brlcad
Date: 2013-08-01 03:52:49 +0000 (Thu, 01 Aug 2013)
Log Message:
-----------
simplify. reviewing all of the remaining NO_INSTALL applications that lacked
LOCAL, they all needed it. this combines them. NO_INSTALL now means leave/put
the binary in the build directory.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
brlcad/trunk/src/fb/tests/CMakeLists.txt
brlcad/trunk/src/libanalyze/tests/CMakeLists.txt
brlcad/trunk/src/libbn/tests/CMakeLists.txt
brlcad/trunk/src/libbrep/CMakeLists.txt
brlcad/trunk/src/libbu/tests/CMakeLists.txt
brlcad/trunk/src/libgcv/CMakeLists.txt
brlcad/trunk/src/librt/tests/CMakeLists.txt
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2013-08-01 03:33:01 UTC
(rev 56400)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2013-08-01 03:52:49 UTC
(rev 56401)
@@ -163,21 +163,15 @@
target_link_libraries(${execname} ${libslist})
+ # In some situations (usually test executables) we want to be able
+ # to force the executable to remain in the local compilation
+ # directory regardless of the global CMAKE_RUNTIME_OUTPUT_DIRECTORY
+ # setting. The NO_INSTALL flag is used to denote such executables.
# If an executable isn't to be installed or needs to be installed
# somewhere other than the default location, the NO_INSTALL argument
- # bypasses the standard install command call. Otherwise, call install
- # with standard arguments.
+ # bypasses the standard install command call.
CHECK_OPT("NO_INSTALL" NO_EXEC_INSTALL "${ARGN}")
- if(NOT NO_EXEC_INSTALL)
- install(TARGETS ${execname} DESTINATION ${BIN_DIR})
- endif(NOT NO_EXEC_INSTALL)
-
- # In some situations (usually testing executables) we want to
- # be able to force the executable to remain in the local directory
- # regardless of the global CMAKE_RUNTIME_OUTPUT_DIRECTORY setting.
- # The LOCAL flag is used to denote such executables.
- CHECK_OPT("LOCAL" LOCAL_EXEC "${ARGN}")
- if(LOCAL_EXEC)
+ if(NO_EXEC_INSTALL)
if(NOT CMAKE_CONFIGURATION_TYPES)
set_target_properties(${execname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR})
else(NOT CMAKE_CONFIGURATION_TYPES)
@@ -186,7 +180,9 @@
set_target_properties(${execname} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}
${CMAKE_CURRENT_BINARY_DIR}/${CFG_TYPE})
endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
endif(NOT CMAKE_CONFIGURATION_TYPES)
- endif(LOCAL_EXEC)
+ else(NO_EXEC_INSTALL)
+ install(TARGETS ${execname} DESTINATION ${BIN_DIR})
+ endif(NO_EXEC_INSTALL)
# Use the list of libraries to be linked into this target to
# accumulate the necessary definitions and compilation flags.
Modified: brlcad/trunk/src/fb/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/fb/tests/CMakeLists.txt 2013-08-01 03:33:01 UTC (rev
56400)
+++ brlcad/trunk/src/fb/tests/CMakeLists.txt 2013-08-01 03:52:49 UTC (rev
56401)
@@ -1,5 +1,5 @@
if(BRLCAD_ENABLE_TK)
- BRLCAD_ADDEXEC(fbthreadtest fbthreadtest.c "libfb;${TCL_TK_LIBRARY}"
NO_INSTALL LOCAL)
+ BRLCAD_ADDEXEC(fbthreadtest fbthreadtest.c "libfb;${TCL_TK_LIBRARY}"
NO_INSTALL)
SET_TARGET_PROPERTIES(fbthreadtest PROPERTIES COMPILE_DEFINITIONS "IF_TK")
SET_TARGET_PROPERTIES(fbthreadtest PROPERTIES LINKER_LANGUAGE C)
endif(BRLCAD_ENABLE_TK)
Modified: brlcad/trunk/src/libanalyze/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libanalyze/tests/CMakeLists.txt 2013-08-01 03:33:01 UTC
(rev 56400)
+++ brlcad/trunk/src/libanalyze/tests/CMakeLists.txt 2013-08-01 03:52:49 UTC
(rev 56401)
@@ -1,4 +1,4 @@
-BRLCAD_ADDEXEC(tester_density density.c "libanalyze;libbu" NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_density density.c "libanalyze;libbu" NO_INSTALL)
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/src/libbn/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbn/tests/CMakeLists.txt 2013-08-01 03:33:01 UTC (rev
56400)
+++ brlcad/trunk/src/libbn/tests/CMakeLists.txt 2013-08-01 03:52:49 UTC (rev
56401)
@@ -1,6 +1,6 @@
-BRLCAD_ADDEXEC(tester_bn_tri_tri_isect_coplanar bn_tri_tri_isect_coplanar.c
"libbu;libbn" NO_INSTALL LOCAL)
-BRLCAD_ADDEXEC(tester_bn_tri_tri_isect bn_tri_tri_isect.c "libbu;libbn"
NO_INSTALL LOCAL)
-BRLCAD_ADDEXEC(tester_bn_list bn_list.c "libbu;libbn" NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bn_tri_tri_isect_coplanar bn_tri_tri_isect_coplanar.c
"libbu;libbn" NO_INSTALL)
+BRLCAD_ADDEXEC(tester_bn_tri_tri_isect bn_tri_tri_isect.c "libbu;libbn"
NO_INSTALL)
+BRLCAD_ADDEXEC(tester_bn_list bn_list.c "libbu;libbn" NO_INSTALL)
# For tester_bn_tri_tri_isect_coplanar, the input format is as follows:
#
Modified: brlcad/trunk/src/libbrep/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbrep/CMakeLists.txt 2013-08-01 03:33:01 UTC (rev
56400)
+++ brlcad/trunk/src/libbrep/CMakeLists.txt 2013-08-01 03:52:49 UTC (rev
56401)
@@ -52,9 +52,9 @@
set_target_properties(libbrep PROPERTIES VERSION 20.0.1 SOVERSION 20)
-BRLCAD_ADDEXEC(test_point_intersect test_point_intersect.cpp "libbrep"
NOSTRICT NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(test_point_intersect test_point_intersect.cpp "libbrep"
NOSTRICT NO_INSTALL)
-BRLCAD_ADDEXEC(test_curve_intersect test_curve_intersect.cpp "libbrep"
NOSTRICT NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(test_curve_intersect test_curve_intersect.cpp "libbrep"
NOSTRICT NO_INSTALL)
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/src/libbu/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/tests/CMakeLists.txt 2013-08-01 03:33:01 UTC (rev
56400)
+++ brlcad/trunk/src/libbu/tests/CMakeLists.txt 2013-08-01 03:52:49 UTC (rev
56401)
@@ -1,5 +1,5 @@
-BRLCAD_ADDEXEC(tester_bu_sscanf bu_sscanf.c libbu NO_INSTALL LOCAL)
-BRLCAD_ADDEXEC(tester_bu_gethostname bu_gethostname.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_sscanf bu_sscanf.c libbu NO_INSTALL)
+BRLCAD_ADDEXEC(tester_bu_gethostname bu_gethostname.c libbu NO_INSTALL)
#
# ************ basename.c tests *************
@@ -8,7 +8,7 @@
###############################
# bu_basename testing #
###############################
-BRLCAD_ADDEXEC(tester_bu_basename bu_basename.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_basename bu_basename.c libbu NO_INSTALL)
add_test(bu_basename_null
tester_bu_basename) # tests NULL
add_test(bu_basename_empty tester_bu_basename
"")
add_test(bu_basename_sl_usr_sl_dir_sl_file tester_bu_basename
"/usr/dir/file")
@@ -40,41 +40,41 @@
###############################
# bu_bitv_and testing #
###############################
-BRLCAD_ADDEXEC(tester_bu_bitv_and bu_bitv_and.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_bitv_and bu_bitv_and.c libbu NO_INSTALL)
add_test(bu_bitv_and_test1 tester_bu_bitv_and "ffffffff" "00000000" "00000000")
add_test(bu_bitv_and_test2 tester_bu_bitv_and "ab00" "1200" "0200")
###############################
# bu_bitv_or testing #
###############################
-BRLCAD_ADDEXEC(tester_bu_bitv_or bu_bitv_or.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_bitv_or bu_bitv_or.c libbu NO_INSTALL)
add_test(bu_bitv_or_test1 tester_bu_bitv_or "ffffffff" "00000000" "ffffffff")
add_test(bu_bitv_or_test2 tester_bu_bitv_or "ab00" "1200" "bb00")
##################################
# bu_bitv_shift testing #
##################################
-BRLCAD_ADDEXEC(tester_bu_bitv_shift bu_bitv_shift.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_bitv_shift bu_bitv_shift.c libbu NO_INSTALL)
add_test(bu_bitv_shift tester_bu_bitv_shift)
##################################
# bu_bitv_to_hex testing #
##################################
-BRLCAD_ADDEXEC(tester_bu_bitv_to_hex bu_bitv_to_hex.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_bitv_to_hex bu_bitv_to_hex.c libbu NO_INSTALL)
add_test(bu_bitv_to_hex_test1 tester_bu_bitv_to_hex "0123" "33323130" 32)
add_test(bu_bitv_to_hex_test2 tester_bu_bitv_to_hex "12" "3231" 16)
################################
# bu_bitv_vls testing #
################################
-BRLCAD_ADDEXEC(tester_bu_bitv_vls bu_bitv_vls.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_bitv_vls bu_bitv_vls.c libbu NO_INSTALL)
add_test(bu_bitv_vls_test1 tester_bu_bitv_vls "00000000" "() ")
add_test(bu_bitv_vls_test2 tester_bu_bitv_vls "f0f0f0f0" "(4, 5, 6, 7, 12, 13,
14, 15, 20, 21, 22, 23, 28, 29, 30, 31) ")
##################################
# bu_hex_to_bitv testing #
##################################
-BRLCAD_ADDEXEC(tester_bu_hex_to_bitv bu_hex_to_bitv.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_hex_to_bitv bu_hex_to_bitv.c libbu NO_INSTALL)
add_test(bu_hex_to_bitv_test1 tester_bu_hex_to_bitv "33323130" "0123" 0)
add_test(bu_hex_to_bitv_test2 tester_bu_hex_to_bitv "30" "0" 0)
add_test(bu_hex_to_bitv_error tester_bu_hex_to_bitv "303" "" 1)
@@ -90,7 +90,7 @@
#################################
# bu_booleanize testing #
#################################
-BRLCAD_ADDEXEC(tester_bu_booleanize bu_booleanize.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_booleanize bu_booleanize.c libbu NO_INSTALL)
add_test(bu_booleanize_null tester_bu_booleanize) # tests NULL
add_test(bu_booleanize_empty tester_bu_booleanize "")
add_test(bu_booleanize_n tester_bu_booleanize "n")
@@ -118,7 +118,7 @@
##################################
# Note - because of the special characters needed in these tests, the strings
# don't work well when fed in from the command line.
-BRLCAD_ADDEXEC(tester_bu_str_isprint bu_str_isprint.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_str_isprint bu_str_isprint.c libbu NO_INSTALL)
add_test(bu_str_isprint_basic tester_bu_str_isprint 1)
add_test(bu_str_isprint_eol tester_bu_str_isprint 2)
add_test(bu_str_isprint_double_slash tester_bu_str_isprint 3)
@@ -134,7 +134,7 @@
##############################
# bu_dirname testing #
##############################
-BRLCAD_ADDEXEC(tester_bu_dirname bu_dirname.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_dirname bu_dirname.c libbu NO_INSTALL)
add_test(bu_dirname__usr_dir_file tester_bu_dirname "/usr/dir/file")
add_test(bu_dirname__usr_dir_ tester_bu_dirname "/usr/dir/")
add_test(bu_dirname__usr__bsl__dir tester_bu_dirname "/usr\\\\/dir")
@@ -164,7 +164,7 @@
# Note - because of the quoting needed in these tests, it is simpler
# to leave the input strings in the C code. Individual tests are triggered
# by number
-BRLCAD_ADDEXEC(tester_bu_escape bu_escape.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_escape bu_escape.c libbu NO_INSTALL)
###################################
# bu_str_unescape testing #
@@ -239,7 +239,7 @@
###
# bu_heap memory allocation testing
###
-BRLCAD_ADDEXEC(tester_bu_heap bu_heap.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_heap bu_heap.c libbu NO_INSTALL)
add_test(bu_heap_test_1 tester_bu_heap)
#
@@ -252,7 +252,7 @@
###############################
# bu_progname testing #
###############################
-BRLCAD_ADDEXEC(tester_bu_progname bu_progname.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_progname bu_progname.c libbu NO_INSTALL)
add_test(bu_progname_tests tester_bu_progname)
#
@@ -262,7 +262,7 @@
# approach - the tests below all test both bu_vls_encode and bu_vls_decode.
# Like many string functions using escaped characters the input strings are
# left in C to minimize pass-through errors.
-BRLCAD_ADDEXEC(tester_bu_quote bu_quote.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_quote bu_quote.c libbu NO_INSTALL)
add_test(bu_quote_test_1 tester_bu_quote 1) # NULL
add_test(bu_quote_test_2 tester_bu_quote 2) # ""
add_test(bu_quote_test_3 tester_bu_quote 3) # " "
@@ -290,19 +290,19 @@
#
# ************ rb_*.c tests *************
#
-BRLCAD_ADDEXEC(tester_bu_redblack bu_redblack.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_redblack bu_redblack.c libbu NO_INSTALL)
add_test(bu_redblack_test tester_bu_redblack)
#
# ************ timer.c tests *************
#
-BRLCAD_ADDEXEC(tester_bu_timer bu_timer.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_timer bu_timer.c libbu NO_INSTALL)
add_test(bu_gettime_test tester_bu_timer)
#
# ************ vls_vprintf.c tests *************
#
-BRLCAD_ADDEXEC(tester_bu_vls_vprintf bu_vls_vprintf.c libbu NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(tester_bu_vls_vprintf bu_vls_vprintf.c libbu NO_INSTALL)
add_test(bu_vls_vprintf_test_1 tester_bu_vls_vprintf 1)
add_test(bu_vls_vprintf_test_2 tester_bu_vls_vprintf 2)
add_test(bu_vls_vprintf_test_3 tester_bu_vls_vprintf 3)
Modified: brlcad/trunk/src/libgcv/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/CMakeLists.txt 2013-08-01 03:33:01 UTC (rev
56400)
+++ brlcad/trunk/src/libgcv/CMakeLists.txt 2013-08-01 03:52:49 UTC (rev
56401)
@@ -21,7 +21,7 @@
add_subdirectory(wfobj)
enable_testing()
-BRLCAD_ADDEXEC(test_bottess test_bottess.c libgcv NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(test_bottess test_bottess.c libgcv NO_INSTALL)
if(CPP_DLL_DEFINES)
SET_PROPERTY(TARGET test_bottess APPEND PROPERTY COMPILE_DEFINITIONS
"BOTTESS_DLL_IMPORTS")
endif(CPP_DLL_DEFINES)
Modified: brlcad/trunk/src/librt/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/tests/CMakeLists.txt 2013-08-01 03:33:01 UTC (rev
56400)
+++ brlcad/trunk/src/librt/tests/CMakeLists.txt 2013-08-01 03:52:49 UTC (rev
56401)
@@ -1,15 +1,15 @@
-BRLCAD_ADDEXEC(test_bundle test_bundle.c "librt" NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(test_bundle test_bundle.c "librt" NO_INSTALL)
add_test(test_bundle test_bundle)
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
bundle.plot3)
-BRLCAD_ADDEXEC(test_dvec test_dvec.cpp "librt" NOSTRICT NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(test_dvec test_dvec.cpp "librt" NOSTRICT NO_INSTALL)
add_test(test_dvec test_dvec)
-BRLCAD_ADDEXEC(test_ssi test_ssi.cpp "librt" NO_INSTALL LOCAL)
+BRLCAD_ADDEXEC(test_ssi test_ssi.cpp "librt" NO_INSTALL)
add_test(test_ssi test_ssi)
# NURBS testing
-BRLCAD_ADDEXEC(nurbs_tester nurbs_tests.cpp "librt;libbrep;libbu" NO_INSTALL
LOCAL)
+BRLCAD_ADDEXEC(nurbs_tester nurbs_tests.cpp "librt;libbrep;libbu" NO_INSTALL)
add_test(NURBS-get_closest_point-distinct_points nurbs_tester
${CMAKE_CURRENT_SOURCE_DIR}/nurbs_surfaces.g 1)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
