Revision: 56403
http://sourceforge.net/p/brlcad/code/56403
Author: brlcad
Date: 2013-08-01 04:35:09 +0000 (Thu, 01 Aug 2013)
Log Message:
-----------
consistency with NO_INSTALL and other var/opts. make NOSTRICT/NOSTRICTCXX and
var friends be NO_STRICT/NO_STRICT_CXX.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
brlcad/trunk/src/conv/CMakeLists.txt
brlcad/trunk/src/conv/raw/CMakeLists.txt
brlcad/trunk/src/conv/step/CMakeLists.txt
brlcad/trunk/src/libbrep/CMakeLists.txt
brlcad/trunk/src/libgcv/wfobj/CMakeLists.txt
brlcad/trunk/src/libged/CMakeLists.txt
brlcad/trunk/src/libpc/CMakeLists.txt
brlcad/trunk/src/librt/CMakeLists.txt
brlcad/trunk/src/librt/tests/CMakeLists.txt
brlcad/trunk/src/proc-db/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2013-08-01 04:15:39 UTC (rev 56402)
+++ brlcad/trunk/CMakeLists.txt 2013-08-01 04:35:09 UTC (rev 56403)
@@ -1178,9 +1178,9 @@
# Enable/disable strict compiler settings - these are used for building
# BRL-CAD by default, but not src/other code. Always used for BRL-CAD
-# code unless the NOSTRICT option is specified when defining a target
+# code unless the NO_STRICT option is specified when defining a target
# with BRLCAD_ADDEXEC or BRLCAD_ADDLIB. If only C++ files in a target
-# are not compatible with strict, the NOSTRICTCXX option can be used.
+# are not compatible with strict, the NO_STRICT_CXX option can be used.
set(BRLCAD_ENABLE_STRICT_ALIASES
ENABLE_STRICT
ENABLE_STRICT_COMPILE
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2013-08-01 04:15:39 UTC
(rev 56402)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2013-08-01 04:35:09 UTC
(rev 56403)
@@ -135,11 +135,11 @@
endforeach(srcfile ${srcslist})
endmacro(FLAGS_TO_FILES)
-# Handle C++ NOSTRICT settings
-macro(CXX_NOSTRICT cxx_srcslist args)
+# Handle C++ NO_STRICT settings
+macro(CXX_NO_STRICT cxx_srcslist args)
if(NOERROR_FLAG)
foreach(extraarg ${args})
- if(${extraarg} MATCHES "NOSTRICTCXX" AND BRLCAD_ENABLE_STRICT)
+ if(${extraarg} MATCHES "NO_STRICT_CXX" AND BRLCAD_ENABLE_STRICT)
foreach(srcfile ${cxx_srcslist})
get_filename_component(srcfile_ext ${srcfile} EXT)
if(${srcfile_ext} STREQUAL ".cxx" OR ${srcfile_ext} STREQUAL ".cpp"
OR ${srcfile_ext} STREQUAL ".cc")
@@ -147,10 +147,10 @@
set_source_files_properties(${srcfile} COMPILE_FLAGS
"${previous_flags} -Wno-error")
endif()
endforeach(srcfile ${cxx_srcslist})
- endif(${extraarg} MATCHES "NOSTRICTCXX" AND BRLCAD_ENABLE_STRICT)
+ endif(${extraarg} MATCHES "NO_STRICT_CXX" AND BRLCAD_ENABLE_STRICT)
endforeach(extraarg ${args})
endif(NOERROR_FLAG)
-endmacro(CXX_NOSTRICT cxx_srcslist)
+endmacro(CXX_NO_STRICT cxx_srcslist)
#-----------------------------------------------------------------------------
@@ -218,16 +218,16 @@
# If this target is marked as incompatible with the strict flags, disable
them
foreach(extraarg ${ARGN})
- if(${extraarg} MATCHES "NOSTRICT$" AND BRLCAD_ENABLE_STRICT)
+ if(${extraarg} MATCHES "NO_STRICT$" AND BRLCAD_ENABLE_STRICT)
if(NOERROR_FLAG)
set_property(TARGET ${execname} APPEND PROPERTY
COMPILE_FLAGS "-Wno-error")
endif(NOERROR_FLAG)
- endif(${extraarg} MATCHES "NOSTRICT$" AND BRLCAD_ENABLE_STRICT)
+ endif(${extraarg} MATCHES "NO_STRICT$" AND BRLCAD_ENABLE_STRICT)
endforeach(extraarg ${ARGN})
- # C++ is handled separately (on a per-file basis) if we have mixed sources
via the NOSTRICTCXX flag
+ # C++ is handled separately (on a per-file basis) if we have mixed sources
via the NO_STRICT_CXX flag
if(${exec_type} STREQUAL "MIXED")
- CXX_NOSTRICT("${srcslist}" "${ARGN}")
+ CXX_NO_STRICT("${srcslist}" "${ARGN}")
endif(${exec_type} STREQUAL "MIXED")
endmacro(BRLCAD_ADDEXEC execname srcslist libslist)
@@ -317,11 +317,11 @@
endif(NOT ${lib_type} STREQUAL "MIXED")
foreach(extraarg ${ARGN})
- if(${extraarg} MATCHES "NOSTRICT" AND BRLCAD_ENABLE_STRICT AND NOT
${lib_type} STREQUAL "MIXED")
+ if(${extraarg} MATCHES "NO_STRICT" AND BRLCAD_ENABLE_STRICT AND NOT
${lib_type} STREQUAL "MIXED")
if(NOERROR_FLAG)
set_property(TARGET ${libname} APPEND PROPERTY COMPILE_FLAGS
"-Wno-error")
endif(NOERROR_FLAG)
- endif(${extraarg} MATCHES "NOSTRICT" AND BRLCAD_ENABLE_STRICT AND NOT
${lib_type} STREQUAL "MIXED")
+ endif(${extraarg} MATCHES "NO_STRICT" AND BRLCAD_ENABLE_STRICT AND NOT
${lib_type} STREQUAL "MIXED")
endforeach(extraarg ${ARGN})
endif(BUILD_SHARED_LIBS)
@@ -369,18 +369,18 @@
# If we can't build this library strict, add the -Wno-error flag
foreach(extraarg ${ARGN})
- if(${extraarg} MATCHES "NOSTRICT" AND BRLCAD_ENABLE_STRICT AND NOT
${lib_type} STREQUAL "MIXED")
+ if(${extraarg} MATCHES "NO_STRICT" AND BRLCAD_ENABLE_STRICT AND NOT
${lib_type} STREQUAL "MIXED")
if(NOERROR_FLAG)
set_property(TARGET ${libname}-static APPEND PROPERTY COMPILE_FLAGS
"-Wno-error")
endif(NOERROR_FLAG)
- endif(${extraarg} MATCHES "NOSTRICT" AND BRLCAD_ENABLE_STRICT AND NOT
${lib_type} STREQUAL "MIXED")
+ endif(${extraarg} MATCHES "NO_STRICT" AND BRLCAD_ENABLE_STRICT AND NOT
${lib_type} STREQUAL "MIXED")
endforeach(extraarg ${ARGN})
endif(BUILD_STATIC_LIBS)
# C++ STRICTNESS is handled separately (on a per-file basis) if we have mixed
- # sources via the NOSTRICTCXX flag
+ # sources via the NO_STRICT_CXX flag
if(${lib_type} STREQUAL "MIXED")
- CXX_NOSTRICT("${srcslist}" "${ARGN}")
+ CXX_NO_STRICT("${srcslist}" "${ARGN}")
endif(${lib_type} STREQUAL "MIXED")
# For any CPP_DLL_DEFINES DLL library, users of that library will need the
DLL_IMPORTS
Modified: brlcad/trunk/src/conv/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/CMakeLists.txt 2013-08-01 04:15:39 UTC (rev
56402)
+++ brlcad/trunk/src/conv/CMakeLists.txt 2013-08-01 04:35:09 UTC (rev
56403)
@@ -32,7 +32,7 @@
LIST(REMOVE_DUPLICATES CONV_INCLUDE_DIRS)
include_directories(${CONV_INCLUDE_DIRS})
-BRLCAD_ADDEXEC(3dm-g 3dm/3dm-g.cpp "libwdb;${OPENNURBS_LIBRARY}" NOSTRICT)
+BRLCAD_ADDEXEC(3dm-g 3dm/3dm-g.cpp "libwdb;${OPENNURBS_LIBRARY}" NO_STRICT)
BRLCAD_ADDEXEC(asc2dsp asc/asc2dsp.c libbu)
Modified: brlcad/trunk/src/conv/raw/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/raw/CMakeLists.txt 2013-08-01 04:15:39 UTC (rev
56402)
+++ brlcad/trunk/src/conv/raw/CMakeLists.txt 2013-08-01 04:35:09 UTC (rev
56403)
@@ -17,7 +17,7 @@
raw-g.cpp
RegionList.cpp
)
-BRLCAD_ADDEXEC(raw-g "${rawg_SRCS}" "libwdb;librt;libbu" NOSTRICT)
+BRLCAD_ADDEXEC(raw-g "${rawg_SRCS}" "libwdb;librt;libbu" NO_STRICT)
BRLCAD_ADDEXEC(g-raw g-raw.c "librt;libgcv;libbu;${WINSOCK_LIB}")
Modified: brlcad/trunk/src/conv/step/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/CMakeLists.txt 2013-08-01 04:15:39 UTC (rev
56402)
+++ brlcad/trunk/src/conv/step/CMakeLists.txt 2013-08-01 04:35:09 UTC (rev
56403)
@@ -487,8 +487,8 @@
#add_definitions(-DAP203e2)
-BRLCAD_ADDEXEC(step-g "${stepg_SOURCES}" "${stepg_LIBS}" NOSTRICT)
-BRLCAD_ADDEXEC(g-step "${gstep_SOURCES}" "${stepg_LIBS}" NOSTRICT)
+BRLCAD_ADDEXEC(step-g "${stepg_SOURCES}" "${stepg_LIBS}" NO_STRICT)
+BRLCAD_ADDEXEC(g-step "${gstep_SOURCES}" "${stepg_LIBS}" NO_STRICT)
if(MSVC)
set(stepg_IMPORTS
Modified: brlcad/trunk/src/libbrep/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbrep/CMakeLists.txt 2013-08-01 04:15:39 UTC (rev
56402)
+++ brlcad/trunk/src/libbrep/CMakeLists.txt 2013-08-01 04:35:09 UTC (rev
56403)
@@ -48,13 +48,13 @@
endif(CPP_DLL_DEFINES)
set_property(GLOBAL PROPERTY libbrep_DEFINES "${libbrep_DEFINES}")
-BRLCAD_ADDLIB(libbrep "${LIBBREP_SOURCES}"
"libbn;libbu;${OPENNURBS_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NOSTRICTCXX)
+BRLCAD_ADDLIB(libbrep "${LIBBREP_SOURCES}"
"libbn;libbu;${OPENNURBS_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NO_STRICT_CXX)
set_target_properties(libbrep PROPERTIES VERSION 20.0.1 SOVERSION 20)
-BRLCAD_ADDEXEC(test_point_intersect test_point_intersect.cpp "libbrep"
NOSTRICT NO_INSTALL)
+BRLCAD_ADDEXEC(test_point_intersect test_point_intersect.cpp "libbrep"
NO_STRICT NO_INSTALL)
-BRLCAD_ADDEXEC(test_curve_intersect test_curve_intersect.cpp "libbrep"
NOSTRICT NO_INSTALL)
+BRLCAD_ADDEXEC(test_curve_intersect test_curve_intersect.cpp "libbrep"
NO_STRICT NO_INSTALL)
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/src/libgcv/wfobj/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/wfobj/CMakeLists.txt 2013-08-01 04:15:39 UTC
(rev 56402)
+++ brlcad/trunk/src/libgcv/wfobj/CMakeLists.txt 2013-08-01 04:35:09 UTC
(rev 56403)
@@ -17,7 +17,7 @@
tri_face.c
)
-BRLCAD_ADDEXEC(obj-g "${OBJ_G_SRCS}" "libbu;libbn;librt;libwdb" NOSTRICTCXX)
+BRLCAD_ADDEXEC(obj-g "${OBJ_G_SRCS}" "libbu;libbn;librt;libwdb" NO_STRICT_CXX)
set(wfobj_ignore_files
obj_grammar_decls.h
Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt 2013-08-01 04:15:39 UTC (rev
56402)
+++ brlcad/trunk/src/libged/CMakeLists.txt 2013-08-01 04:35:09 UTC (rev
56403)
@@ -7,7 +7,7 @@
set(LIBGED_CMD_INCLUDE_DIRS ${LIBGED_CMD_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/simulate ${BULLET_INCLUDE_DIR})
# The Bullet headers introduce a lot of shadow warnings - don't stop the
# build because of them
- set(NOSTRICTCXX_SETTING "NOSTRICTCXX")
+ set(NO_STRICT_CXX_SETTING "NO_STRICT_CXX")
endif(BULLET_FOUND)
if(ADAPTAGRAMS_FOUND)
@@ -331,7 +331,7 @@
add_definitions(-DCLIPPER_DLL_IMPORTS)
endif(CPP_DLL_DEFINES)
-BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}"
"libwdb;librt;libfb;libbu;libicv;libanalyze;${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}"
${NOSTRICTCXX_SETTING})
+BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}"
"libwdb;librt;libfb;libbu;libicv;libanalyze;${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}"
${NO_STRICT_CXX_SETTING})
SET_TARGET_PROPERTIES(libged PROPERTIES VERSION 20.0.1 SOVERSION 20)
set(ged_ignore_files
Modified: brlcad/trunk/src/libpc/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libpc/CMakeLists.txt 2013-08-01 04:15:39 UTC (rev
56402)
+++ brlcad/trunk/src/libpc/CMakeLists.txt 2013-08-01 04:35:09 UTC (rev
56403)
@@ -60,7 +60,7 @@
-DOBJ_BREP=1
)
-BRLCAD_ADDLIB(libpc "${LIBPC_SOURCES}"
"libbu;${OPENNURBS_LIBRARY};${STDCXX_LIBRARIES}" NOSTRICTCXX)
+BRLCAD_ADDLIB(libpc "${LIBPC_SOURCES}"
"libbu;${OPENNURBS_LIBRARY};${STDCXX_LIBRARIES}" NO_STRICT_CXX)
SET_TARGET_PROPERTIES(libpc PROPERTIES VERSION 20.0.1 SOVERSION 20)
#BRLCAD_ADDEXEC(solver_test solver_test.cpp libpc NO_INSTALL)
Modified: brlcad/trunk/src/librt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/CMakeLists.txt 2013-08-01 04:15:39 UTC (rev
56402)
+++ brlcad/trunk/src/librt/CMakeLists.txt 2013-08-01 04:35:09 UTC (rev
56403)
@@ -287,7 +287,7 @@
set(LIBRT_SOURCES ${LIBRT_SOURCES} timer42.c)
endif(MSVC)
-BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}"
"${LIBVDS_LIBRARY};libbn;libbu;${OPENNURBS_LIBRARY};${P2T_LIBRARY};libbrep;${REGEX_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NOSTRICTCXX)
+BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}"
"${LIBVDS_LIBRARY};libbn;libbu;${OPENNURBS_LIBRARY};${P2T_LIBRARY};libbrep;${REGEX_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NO_STRICT_CXX)
SET_TARGET_PROPERTIES(librt PROPERTIES VERSION 20.0.1 SOVERSION 20)
if(CPP_DLL_DEFINES)
@@ -302,10 +302,10 @@
${CMAKE_CURRENT_SOURCE_DIR}/../libbrep
)
-#BRLCAD_ADDEXEC(test_bot2nurbs test_bot2nurbs.cpp "librt;libwdb;libbrep;libbu"
NOSTRICT NO_INSTALL)
-#BRLCAD_ADDEXEC(test_nurbsfit test_nurbsfit.cpp "librt;libwdb;libbrep;libbu"
NOSTRICT NO_INSTALL)
-#BRLCAD_ADDEXEC(test_root3-subd test_root3-subd.cpp
"librt;libwdb;libbrep;libbu" NOSTRICT NO_INSTALL)
-#BRLCAD_ADDEXEC(test_surfacetree test_surfacetree.cpp
"librt;libwdb;libbrep;libbu" NOSTRICT NO_INSTALL)
+#BRLCAD_ADDEXEC(test_bot2nurbs test_bot2nurbs.cpp "librt;libwdb;libbrep;libbu"
NO_STRICT NO_INSTALL)
+#BRLCAD_ADDEXEC(test_nurbsfit test_nurbsfit.cpp "librt;libwdb;libbrep;libbu"
NO_STRICT NO_INSTALL)
+#BRLCAD_ADDEXEC(test_root3-subd test_root3-subd.cpp
"librt;libwdb;libbrep;libbu" NO_STRICT NO_INSTALL)
+#BRLCAD_ADDEXEC(test_surfacetree test_surfacetree.cpp
"librt;libwdb;libbrep;libbu" NO_STRICT NO_INSTALL)
add_subdirectory(tests)
Modified: brlcad/trunk/src/librt/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/tests/CMakeLists.txt 2013-08-01 04:15:39 UTC (rev
56402)
+++ brlcad/trunk/src/librt/tests/CMakeLists.txt 2013-08-01 04:35:09 UTC (rev
56403)
@@ -2,7 +2,7 @@
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)
+BRLCAD_ADDEXEC(test_dvec test_dvec.cpp "librt" NO_STRICT NO_INSTALL)
add_test(test_dvec test_dvec)
BRLCAD_ADDEXEC(test_ssi test_ssi.cpp "librt" NO_INSTALL)
Modified: brlcad/trunk/src/proc-db/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/proc-db/CMakeLists.txt 2013-08-01 04:15:39 UTC (rev
56402)
+++ brlcad/trunk/src/proc-db/CMakeLists.txt 2013-08-01 04:35:09 UTC (rev
56403)
@@ -10,8 +10,8 @@
BRLCAD_ADDEXEC(brep_cube brep_cube.cpp "libwdb;${OPENNURBS_LIBRARY}")
BRLCAD_ADDEXEC(brep_simple brep_simple.cpp "libwdb;${OPENNURBS_LIBRARY}")
-# NOSTRICT used due to openNURBS header overflow warning
-BRLCAD_ADDEXEC(brepintersect brepintersect.cpp "libwdb;${OPENNURBS_LIBRARY}"
NOSTRICT)
+# NO_STRICT used due to openNURBS header overflow warning
+BRLCAD_ADDEXEC(brepintersect brepintersect.cpp "libwdb;${OPENNURBS_LIBRARY}"
NO_STRICT)
BRLCAD_ADDEXEC(breplicator breplicator.cpp "libwdb;${OPENNURBS_LIBRARY}")
BRLCAD_ADDEXEC(brickwall brickwall.c libwdb)
BRLCAD_ADDEXEC(clutter "clutter.c;common.c" "libwdb;${M_LIBRARY}")
@@ -38,8 +38,8 @@
BRLCAD_ADDEXEC(sphflake sphflake.c "libwdb;${M_LIBRARY}")
BRLCAD_ADDEXEC(spltest spltest.c libwdb)
-# NOSTRICT used due to openNURBS header inlining warning
-BRLCAD_ADDEXEC(surfaceintersect surfaceintersect.cpp
"libwdb;${OPENNURBS_LIBRARY}" NOSTRICT)
+# NO_STRICT used due to openNURBS header inlining warning
+BRLCAD_ADDEXEC(surfaceintersect surfaceintersect.cpp
"libwdb;${OPENNURBS_LIBRARY}" NO_STRICT)
BRLCAD_ADDEXEC(tea tea.c libwdb)
BRLCAD_ADDEXEC(tea_nmg tea_nmg.c libwdb)
BRLCAD_ADDEXEC(wavy wavy.c libwdb)
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
