ws consistency removing trailing ws and much more (see sh/ws.sh)
This commit is contained in:
Christopher Sean Morrison
parent
dfae3b641f
commit
bf0b0a4d0b
11 changed files with 155 additions and 158 deletions
|
|
@ -36,7 +36,7 @@
|
|||
# *** BRL-CAD's CMakeLists.txt ***
|
||||
# *******************************************************************
|
||||
|
||||
# This file contains the top level CMakeLists.txt logic for the
|
||||
# This file contains the top level CMakeLists.txt logic for the
|
||||
# BRL-CAD software package.
|
||||
|
||||
# Minimum required version of CMake
|
||||
|
|
@ -92,8 +92,8 @@ IF(NOT WIN32)
|
|||
ENDIF(NOT WIN32)
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
# The following logic is what allows binaries to run successfully in
|
||||
# the build directory AND install directory. Thanks to plplot for
|
||||
# The following logic is what allows binaries to run successfully in
|
||||
# the build directory AND install directory. Thanks to plplot for
|
||||
# identifying the necessity of setting CMAKE_INSTALL_NAME_DIR on OSX.
|
||||
|
||||
# use, i.e. don't skip the full RPATH for the build tree
|
||||
|
|
@ -109,7 +109,7 @@ if (NOT APPLE)
|
|||
endif(NOT APPLE)
|
||||
SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
|
||||
|
||||
# add the automatically determined parts of the RPATH which point to
|
||||
# add the automatically determined parts of the RPATH which point to
|
||||
# directories outside the build tree to the install RPATH
|
||||
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
|
||||
|
|
@ -149,9 +149,9 @@ ENDFOREACH()
|
|||
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Configure install locations.
|
||||
# Configure install locations.
|
||||
|
||||
# The location in which to install BRLCAD. Need a good Debug location
|
||||
# The location in which to install BRLCAD. Need a good Debug location
|
||||
# for Windows. Only do this if CMAKE_INSTALL_PREFIX hasn't been set
|
||||
# already, to try and allow parent builds (if any) some control.
|
||||
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||||
|
|
|
|||
|
|
@ -25,9 +25,8 @@ SET(step_example_data
|
|||
INSTALL(FILES ${step_example_data} DESTINATION ${DATA_DIR}/data/example)
|
||||
|
||||
|
||||
|
||||
SET(step_datafiles
|
||||
pdmnet.exp
|
||||
select.exp
|
||||
select.exp
|
||||
)
|
||||
INSTALL(FILES ${step_datafiles} DESTINATION ${DATA_DIR}/data)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
SET(scl_MANS
|
||||
man/man1/dataprobe.1
|
||||
man/man1/fedex.1
|
||||
man/man1/fedex_plus.1
|
||||
man/man1/dataprobe.1
|
||||
man/man1/fedex.1
|
||||
man/man1/fedex_plus.1
|
||||
man/man1/mkProbe.1
|
||||
)
|
||||
INSTALL(FILES ${scl_MANS} DESTINATION ${MAN_DIR}/man1)
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ SET(express_HDRS
|
|||
express/caseitem.h
|
||||
express/de_end.h
|
||||
express/decstart.h
|
||||
express/defstart.h
|
||||
express/dict.h
|
||||
express/entity.h
|
||||
express/defstart.h
|
||||
express/dict.h
|
||||
express/entity.h
|
||||
express/error.h
|
||||
express/expbasic.h
|
||||
express/expr.h
|
||||
|
|
@ -32,5 +32,5 @@ SET(exppp_HDRS
|
|||
install(FILES ${exppp_HDRS} DESTINATION include/exppp)
|
||||
|
||||
SET(SCL_noinst_HEADERS
|
||||
sclprefixes.h
|
||||
sclprefixes.h
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,28 +1,28 @@
|
|||
|
||||
set(LIBSTEPDAI_SRCS
|
||||
sdaiApplication_instance_set.cc
|
||||
sdaiSession_instance.cc
|
||||
sdaiObject.cc
|
||||
sdaiDaObject.cc
|
||||
sdaiEntity_extent.cc
|
||||
sdaiEntity_extent_set.cc
|
||||
sdaiModel_contents.cc
|
||||
sdaiApplication_instance_set.cc
|
||||
sdaiSession_instance.cc
|
||||
sdaiObject.cc
|
||||
sdaiDaObject.cc
|
||||
sdaiEntity_extent.cc
|
||||
sdaiEntity_extent_set.cc
|
||||
sdaiModel_contents.cc
|
||||
sdaiModel_contents_list.cc
|
||||
)
|
||||
|
||||
SET(LIBSTEPDAI_PRIVATE_HDRS
|
||||
ErrorMap.hh
|
||||
ErrorRpt.hh
|
||||
impconv.hh
|
||||
imptypes.hh
|
||||
sdaiApplication_instance_set.h
|
||||
sdaiDaObject.h
|
||||
sdaiEntity_extent.h
|
||||
sdaiEntity_extent_set.h
|
||||
sdaiModel_contents.h
|
||||
sdaiModel_contents_list.h
|
||||
sdaiObject.h
|
||||
sdaiSession_instance.h
|
||||
ErrorMap.hh
|
||||
ErrorRpt.hh
|
||||
impconv.hh
|
||||
imptypes.hh
|
||||
sdaiApplication_instance_set.h
|
||||
sdaiDaObject.h
|
||||
sdaiEntity_extent.h
|
||||
sdaiEntity_extent_set.h
|
||||
sdaiModel_contents.h
|
||||
sdaiModel_contents_list.h
|
||||
sdaiObject.h
|
||||
sdaiSession_instance.h
|
||||
StrUtil.hh
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
|
||||
set(LIBSTEPEDITOR_SRCS
|
||||
STEPfile.cc
|
||||
STEPfile.inline.cc
|
||||
cmdmgr.cc
|
||||
dispnode.cc
|
||||
dispnodelist.cc
|
||||
instmgr.cc
|
||||
mgrnode.cc
|
||||
mgrnodearray.cc
|
||||
mgrnodelist.cc
|
||||
needFunc.cc
|
||||
s_HEADER_SCHEMA.cc
|
||||
STEPfile.cc
|
||||
STEPfile.inline.cc
|
||||
cmdmgr.cc
|
||||
dispnode.cc
|
||||
dispnodelist.cc
|
||||
instmgr.cc
|
||||
mgrnode.cc
|
||||
mgrnodearray.cc
|
||||
mgrnodelist.cc
|
||||
needFunc.cc
|
||||
s_HEADER_SCHEMA.cc
|
||||
s_HEADER_SCHEMA.init.cc
|
||||
)
|
||||
|
||||
SET(LIBSTEPEDITOR_PRIVATE_HDRS
|
||||
STEPfile.h
|
||||
cmdmgr.h
|
||||
dispnode.h
|
||||
dispnodelist.h
|
||||
editordefines.h
|
||||
instmgr.h
|
||||
mgrnode.h
|
||||
mgrnodearray.h
|
||||
mgrnodelist.h
|
||||
needFunc.h
|
||||
s_HEADER_SCHEMA.h
|
||||
STEPfile.h
|
||||
cmdmgr.h
|
||||
dispnode.h
|
||||
dispnodelist.h
|
||||
editordefines.h
|
||||
instmgr.h
|
||||
mgrnode.h
|
||||
mgrnodearray.h
|
||||
mgrnodelist.h
|
||||
needFunc.h
|
||||
s_HEADER_SCHEMA.h
|
||||
seeinfodefault.h
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,55 +1,55 @@
|
|||
|
||||
set(LIBSTEPCORE_SRCS
|
||||
sdaiApplication_instance.cc
|
||||
STEPcomplex.cc
|
||||
STEPattribute.cc
|
||||
STEPattribute.inline.cc
|
||||
sdai.cc
|
||||
sdaiEnum.cc
|
||||
sdaiString.cc
|
||||
sdaiSelect.cc
|
||||
sdaiBinary.cc
|
||||
STEPaggregate.cc
|
||||
STEPundefined.cc
|
||||
STEPattributeList.cc
|
||||
SingleLinkList.cc
|
||||
SingleLinkList.inline.cc
|
||||
Registry.inline.cc
|
||||
ExpDict.cc
|
||||
ExpDict.inline.cc
|
||||
read_func.cc
|
||||
collect.cc
|
||||
complexlist.cc
|
||||
entlist.cc
|
||||
multlist.cc
|
||||
orlist.cc
|
||||
entnode.cc
|
||||
non-ors.cc
|
||||
match-ors.cc
|
||||
trynext.cc
|
||||
sdaiApplication_instance.cc
|
||||
STEPcomplex.cc
|
||||
STEPattribute.cc
|
||||
STEPattribute.inline.cc
|
||||
sdai.cc
|
||||
sdaiEnum.cc
|
||||
sdaiString.cc
|
||||
sdaiSelect.cc
|
||||
sdaiBinary.cc
|
||||
STEPaggregate.cc
|
||||
STEPundefined.cc
|
||||
STEPattributeList.cc
|
||||
SingleLinkList.cc
|
||||
SingleLinkList.inline.cc
|
||||
Registry.inline.cc
|
||||
ExpDict.cc
|
||||
ExpDict.inline.cc
|
||||
read_func.cc
|
||||
collect.cc
|
||||
complexlist.cc
|
||||
entlist.cc
|
||||
multlist.cc
|
||||
orlist.cc
|
||||
entnode.cc
|
||||
non-ors.cc
|
||||
match-ors.cc
|
||||
trynext.cc
|
||||
print.cc
|
||||
)
|
||||
|
||||
SET(LIBSTEPCORE_PRIVATE_HDRS
|
||||
baseType.h
|
||||
complexSupport.h
|
||||
dictdefs.h
|
||||
ExpDict.h
|
||||
read_func.h
|
||||
Registry.h
|
||||
scl_osschema.h
|
||||
sdaiApplication_instance.h
|
||||
sdaiBinary.h
|
||||
sdaiEnum.h
|
||||
sdai.h
|
||||
sdaiSelect.h
|
||||
sdaiString.h
|
||||
Select.h
|
||||
SingleLinkList.h
|
||||
STEPaggregate.h
|
||||
STEPattribute.h
|
||||
STEPattributeList.h
|
||||
STEPcomplex.h
|
||||
baseType.h
|
||||
complexSupport.h
|
||||
dictdefs.h
|
||||
ExpDict.h
|
||||
read_func.h
|
||||
Registry.h
|
||||
scl_osschema.h
|
||||
sdaiApplication_instance.h
|
||||
sdaiBinary.h
|
||||
sdaiEnum.h
|
||||
sdai.h
|
||||
sdaiSelect.h
|
||||
sdaiString.h
|
||||
Select.h
|
||||
SingleLinkList.h
|
||||
STEPaggregate.h
|
||||
STEPattribute.h
|
||||
STEPattributeList.h
|
||||
STEPcomplex.h
|
||||
STEPundefined.h
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +1,26 @@
|
|||
|
||||
set(LIBSTEPUTILS_SRCS
|
||||
Str.cc
|
||||
dirobj.cc
|
||||
gennode.cc
|
||||
gennodelist.cc
|
||||
gennodearray.cc
|
||||
scl_hash.cc
|
||||
errordesc.cc
|
||||
Str.cc
|
||||
dirobj.cc
|
||||
gennode.cc
|
||||
gennodelist.cc
|
||||
gennodearray.cc
|
||||
scl_hash.cc
|
||||
errordesc.cc
|
||||
scl_char_str_list.cc
|
||||
)
|
||||
|
||||
SET(LIBSTEPUTILS_PRIVATE_HDRS
|
||||
dirobj.h
|
||||
errordesc.h
|
||||
gennodearray.h
|
||||
gennode.h
|
||||
gennodelist.h
|
||||
scl_char_str_list.h
|
||||
scldir.h
|
||||
scl_hash.h
|
||||
stat.h
|
||||
Str.h
|
||||
dirobj.h
|
||||
errordesc.h
|
||||
gennodearray.h
|
||||
gennode.h
|
||||
gennodelist.h
|
||||
scl_char_str_list.h
|
||||
scldir.h
|
||||
scl_hash.h
|
||||
stat.h
|
||||
Str.h
|
||||
str_list.h
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -20,4 +20,3 @@ SCL_ADDLIB(libexppp "${LIBEXPPP_SOURCES}" express)
|
|||
set_target_properties(libexppp PROPERTIES PREFIX "")
|
||||
|
||||
SCL_ADDEXEC(exppp "${EXPPP_SOURCES}" "libexppp express")
|
||||
|
||||
|
|
|
|||
|
|
@ -5,26 +5,26 @@ ADD_LEX_YACC_DEPENDENCY(ExpScanner ExpParser)
|
|||
set(EXPRESS_SOURCES
|
||||
${YACC_ExpParser_OUTPUTS}
|
||||
${LEX_ExpScanner_OUTPUTS}
|
||||
symbol.c
|
||||
type.c
|
||||
variable.c
|
||||
expr.c
|
||||
entity.c
|
||||
caseitem.c
|
||||
stmt.c
|
||||
alg.c
|
||||
scope.c
|
||||
schema.c
|
||||
resolve.c
|
||||
lexact.c
|
||||
linklist.c
|
||||
error.c
|
||||
dict.c
|
||||
hash.c
|
||||
memory.c
|
||||
object.c
|
||||
inithook.c
|
||||
yyvars.c
|
||||
symbol.c
|
||||
type.c
|
||||
variable.c
|
||||
expr.c
|
||||
entity.c
|
||||
caseitem.c
|
||||
stmt.c
|
||||
alg.c
|
||||
scope.c
|
||||
schema.c
|
||||
resolve.c
|
||||
lexact.c
|
||||
linklist.c
|
||||
error.c
|
||||
dict.c
|
||||
hash.c
|
||||
memory.c
|
||||
object.c
|
||||
inithook.c
|
||||
yyvars.c
|
||||
express.c
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -14,23 +14,23 @@ set(fedex_idl_SOURCES
|
|||
)
|
||||
|
||||
set(fedex_plus_SOURCES
|
||||
${FEDEX_COMMON_SRCS}
|
||||
fedex_main.c
|
||||
classes_wrapper.cc
|
||||
classes.c
|
||||
selects.c
|
||||
multpass.c
|
||||
collect.cc
|
||||
complexlist.cc
|
||||
entlist.cc
|
||||
multlist.cc
|
||||
orlist.cc
|
||||
entnode.cc
|
||||
expressbuild.cc
|
||||
non-ors.cc
|
||||
match-ors.cc
|
||||
trynext.cc
|
||||
write.cc
|
||||
${FEDEX_COMMON_SRCS}
|
||||
fedex_main.c
|
||||
classes_wrapper.cc
|
||||
classes.c
|
||||
selects.c
|
||||
multpass.c
|
||||
collect.cc
|
||||
complexlist.cc
|
||||
entlist.cc
|
||||
multlist.cc
|
||||
orlist.cc
|
||||
entnode.cc
|
||||
expressbuild.cc
|
||||
non-ors.cc
|
||||
match-ors.cc
|
||||
trynext.cc
|
||||
write.cc
|
||||
print.cc
|
||||
)
|
||||
|
||||
|
|
@ -49,4 +49,3 @@ SCL_ADDEXEC(fedex_os "${fedex_os_SOURCES}" "libexppp express")
|
|||
SCL_ADDEXEC(fedex_idl "${fedex_idl_SOURCES}" "libexppp express")
|
||||
|
||||
SCL_ADDEXEC(fedex_plus "${fedex_plus_SOURCES}" "libexppp express")
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue