Skip to content

Commit 44e02c9

Browse files
starseekermpictor
starseeker
authored and
mpictor
committed
whitespace changes
1 parent c0e74a9 commit 44e02c9

34 files changed

Lines changed: 768 additions & 761 deletions

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ endif(NOT DEFINED SC_SDAI_ADDITIONAL_EXES_SRCS )
8686

8787
if( NOT DEFINED SC_BUILD_SCHEMAS )
8888
list( APPEND CONFIG_END_MESSAGES
89-
"** CMake variable SC_BUILD_SCHEMAS was not set. Defaults to building ALL schemas, which will take a"
90-
" while; see http://stepcode.org/mw/index.php?title=STEPcode_CMake_variables#SC_BUILD_SCHEMAS" )
89+
"** CMake variable SC_BUILD_SCHEMAS was not set. Defaults to building ALL schemas, which will take a"
90+
" while; see http://stepcode.org/mw/index.php?title=STEPcode_CMake_variables#SC_BUILD_SCHEMAS" )
9191
#this makes SC_BUILD_SCHEMAS show up in cmake-gui
9292
SET(SC_BUILD_SCHEMAS "ALL" CACHE string "Semicolon-separated list of paths to EXPRESS schemas to be built" )
9393
endif( NOT DEFINED SC_BUILD_SCHEMAS )

‎cmake/CheckCFileRuns.cmake‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ MACRO(CHECK_C_FILE_RUNS SOURCE VAR)
3030
"-D${VAR} ${CMAKE_REQUIRED_FLAGS}")
3131
IF(CMAKE_REQUIRED_LIBRARIES)
3232
SET(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES
33-
"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
33+
"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
3434
ELSE(CMAKE_REQUIRED_LIBRARIES)
3535
SET(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES)
3636
ENDIF(CMAKE_REQUIRED_LIBRARIES)
3737
IF(CMAKE_REQUIRED_INCLUDES)
3838
SET(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES
39-
"-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
39+
"-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
4040
ELSE(CMAKE_REQUIRED_INCLUDES)
4141
SET(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES)
4242
ENDIF(CMAKE_REQUIRED_INCLUDES)
@@ -45,7 +45,7 @@ MACRO(CHECK_C_FILE_RUNS SOURCE VAR)
4545
TRY_RUN(${VAR}_EXITCODE ${VAR}_COMPILED
4646
${CMAKE_BINARY_DIR}
4747
${SOURCE}
48-
COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${FILE_RUN_DEFINITIONS}
48+
COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${FILE_RUN_DEFINITIONS}
4949
CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
5050
-DCMAKE_SKIP_RPATH:BOOL=${CMAKE_SKIP_RPATH}
5151
"${CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES}"
@@ -60,23 +60,23 @@ MACRO(CHECK_C_FILE_RUNS SOURCE VAR)
6060
SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
6161
MESSAGE(STATUS "Performing Test ${VAR} - Success")
6262
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
63-
"Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n"
64-
"${OUTPUT}\n"
65-
"Return value: ${${VAR}}\n"
66-
"Source file was:\n${SOURCE}\n")
63+
"Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n"
64+
"${OUTPUT}\n"
65+
"Return value: ${${VAR}}\n"
66+
"Source file was:\n${SOURCE}\n")
6767
ELSE("${${VAR}_EXITCODE}" EQUAL 0)
6868
IF(CMAKE_CROSSCOMPILING AND "${${VAR}_EXITCODE}" MATCHES "FAILED_TO_RUN")
69-
SET(${VAR} "${${VAR}_EXITCODE}")
69+
SET(${VAR} "${${VAR}_EXITCODE}")
7070
ELSE(CMAKE_CROSSCOMPILING AND "${${VAR}_EXITCODE}" MATCHES "FAILED_TO_RUN")
71-
SET(${VAR} "" CACHE INTERNAL "Test ${VAR}")
71+
SET(${VAR} "" CACHE INTERNAL "Test ${VAR}")
7272
ENDIF(CMAKE_CROSSCOMPILING AND "${${VAR}_EXITCODE}" MATCHES "FAILED_TO_RUN")
7373

7474
MESSAGE(STATUS "Performing Test ${VAR} - Failed")
7575
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
76-
"Performing C SOURCE FILE Test ${VAR} failed with the following output:\n"
77-
"${OUTPUT}\n"
78-
"Return value: ${${VAR}_EXITCODE}\n"
79-
"Source file was:\n${SOURCE}\n")
76+
"Performing C SOURCE FILE Test ${VAR} failed with the following output:\n"
77+
"${OUTPUT}\n"
78+
"Return value: ${${VAR}_EXITCODE}\n"
79+
"Source file was:\n${SOURCE}\n")
8080

8181
ENDIF("${${VAR}_EXITCODE}" EQUAL 0)
8282
ENDIF("${VAR}" MATCHES "^${VAR}$")

‎cmake/SC_CXX_schema_macros.cmake‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ MACRO( P21_TESTS sfile )
1212
foreach( TEST_FILE ${P21_FILES} )
1313
get_filename_component( FNAME ${TEST_FILE} NAME_WE )
1414
add_test( NAME read_write_cpp_${PROJECT_NAME}_${FNAME}
15-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
16-
COMMAND p21read_${PROJECT_NAME} ${TEST_FILE} )
15+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
16+
COMMAND p21read_${PROJECT_NAME} ${TEST_FILE} )
1717
set_tests_properties( read_write_cpp_${PROJECT_NAME}_${FNAME} PROPERTIES DEPENDS build_cpp_${PROJECT_NAME} LABELS cpp_schema_rw )
1818
if(NOT WIN32)
1919
add_test( NAME read_lazy_cpp_${PROJECT_NAME}_${FNAME}
20-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
21-
COMMAND lazy_${PROJECT_NAME} ${TEST_FILE} )
20+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
21+
COMMAND lazy_${PROJECT_NAME} ${TEST_FILE} )
2222
set_tests_properties( read_lazy_cpp_${PROJECT_NAME}_${FNAME} PROPERTIES DEPENDS build_lazy_cpp_${PROJECT_NAME} LABELS cpp_schema_rw )
2323
endif(NOT WIN32)
2424
endforeach()
@@ -48,24 +48,24 @@ ENDMACRO( SCHEMA_EXES )
4848
# label the tests and set dependencies
4949
MACRO( SCHEMA_TESTS )
5050
add_test( NAME generate_cpp_${PROJECT_NAME}
51-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
52-
COMMAND ${CMAKE_COMMAND} --build .
53-
--target generate_cpp_${PROJECT_NAME}
54-
--config $<CONFIGURATION> )
51+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
52+
COMMAND ${CMAKE_COMMAND} --build .
53+
--target generate_cpp_${PROJECT_NAME}
54+
--config $<CONFIGURATION> )
5555
set_tests_properties( generate_cpp_${PROJECT_NAME} PROPERTIES LABELS cpp_schema_gen )
5656
add_test( NAME build_cpp_${PROJECT_NAME}
57-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
58-
COMMAND ${CMAKE_COMMAND} --build .
59-
--target p21read_${PROJECT_NAME}
60-
--config $<CONFIGURATION> )
57+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
58+
COMMAND ${CMAKE_COMMAND} --build .
59+
--target p21read_${PROJECT_NAME}
60+
--config $<CONFIGURATION> )
6161
set_tests_properties( build_cpp_${PROJECT_NAME} PROPERTIES DEPENDS generate_cpp_${PROJECT_NAME} LABELS cpp_schema_build )
6262
if(NOT WIN32)
63-
add_test( NAME build_lazy_cpp_${PROJECT_NAME}
64-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
65-
COMMAND ${CMAKE_COMMAND} --build .
66-
--target lazy_${PROJECT_NAME}
67-
--config $<CONFIGURATION> )
68-
set_tests_properties( build_lazy_cpp_${PROJECT_NAME} PROPERTIES DEPENDS generate_cpp_${PROJECT_NAME} LABELS cpp_schema_build )
63+
add_test( NAME build_lazy_cpp_${PROJECT_NAME}
64+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
65+
COMMAND ${CMAKE_COMMAND} --build .
66+
--target lazy_${PROJECT_NAME}
67+
--config $<CONFIGURATION> )
68+
set_tests_properties( build_lazy_cpp_${PROJECT_NAME} PROPERTIES DEPENDS generate_cpp_${PROJECT_NAME} LABELS cpp_schema_build )
6969
endif(NOT WIN32)
7070
ENDMACRO( SCHEMA_TESTS )
7171

@@ -84,19 +84,19 @@ MACRO( SCHEMA_TARGETS expFile schemaName sourceFiles )
8484
# this calls a cmake script because it doesn't seem to be possible
8585
# to divert stdout, stderr in cmake except via execute_process
8686
add_custom_command( OUTPUT ${sourceFiles}
87-
COMMAND ${CMAKE_COMMAND} -DEXE=\"$<TARGET_FILE:exp2cxx>\" -DEXP=\"${expFile}\"
88-
-DONESHOT=\"${SC_GENERATE_CXX_ONESHOT}\"
89-
-DSDIR=\"${CMAKE_CURRENT_LIST_DIR}\"
90-
-P ${SC_CMAKE_DIR}/SC_Run_exp2cxx.cmake
91-
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
92-
COMMENT "[exp2cxx] Generating ${${PROJECT_NAME}_file_count} C++ files for ${PROJECT_NAME}."
93-
)
87+
COMMAND ${CMAKE_COMMAND} -DEXE=\"$<TARGET_FILE:exp2cxx>\" -DEXP=\"${expFile}\"
88+
-DONESHOT=\"${SC_GENERATE_CXX_ONESHOT}\"
89+
-DSDIR=\"${CMAKE_CURRENT_LIST_DIR}\"
90+
-P ${SC_CMAKE_DIR}/SC_Run_exp2cxx.cmake
91+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
92+
COMMENT "[exp2cxx] Generating ${${PROJECT_NAME}_file_count} C++ files for ${PROJECT_NAME}."
93+
)
9494
# will include_directories behave as desired in a macro?
9595
include_directories(
9696
${CMAKE_CURRENT_SOURCE_DIR} ${SC_SOURCE_DIR}/src/cldai ${SC_SOURCE_DIR}/src/cleditor
9797
${SC_SOURCE_DIR}/src/clutils ${SC_SOURCE_DIR}/src/clstepcore ${SC_SOURCE_DIR}/src/base
9898
${SC_SOURCE_DIR}/src/base/judy/src
99-
)
99+
)
100100
# if testing is enabled, "TESTABLE" sets property EXCLUDE_FROM_ALL and prevents installation
101101
SC_ADDLIB( ${PROJECT_NAME} "${sourceFiles}" "stepdai;stepcore;stepeditor;steputils;base" "TESTABLE" )
102102
add_dependencies( ${PROJECT_NAME} generate_cpp_${PROJECT_NAME} )

‎cmake/SC_Config_Headers.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ configure_file(${SC_CMAKE_DIR}/sc_version_string.cmake ${SC_BINARY_DIR}/sc_versi
7979
add_custom_target(version_string ALL DEPENDS ver_string )
8080
# creates sc_version_string.h using cmake script
8181
add_custom_command(OUTPUT ver_string ${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
82-
COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${SC_SOURCE_DIR}
83-
-DBINARY_DIR=${SC_BINARY_DIR}
84-
-P ${SC_BINARY_DIR}/sc_version_string.cmake)
82+
COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${SC_SOURCE_DIR}
83+
-DBINARY_DIR=${SC_BINARY_DIR}
84+
-P ${SC_BINARY_DIR}/sc_version_string.cmake)
8585
# sc_version_string.h is a generated file
8686
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
8787
PROPERTIES GENERATED TRUE

‎cmake/SC_Regenerate.cmake‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,44 +17,44 @@ else(NOT SC_GENERATE_LEXER_PARSER)
1717
endif(NOT SC_GENERATE_LEXER_PARSER)
1818
set_property(CACHE SC_GENERATE_LEXER_PARSER PROPERTY STRINGS AUTO ON OFF)
1919
if (NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "AUTO" AND NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON" AND NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
20-
message(WARNING "Unknown value ${SC_GENERATE_LEXER_PARSER} supplied for BRLCAD_WORD_SIZE - defaulting to AUTO")
21-
message(WARNING "Valid options are AUTO, ON and OFF")
22-
set(SC_GENERATE_LEXER_PARSER "AUTO" CACHE STRING "Use Perplex, RE2C and Lemon to generate C source code.")
20+
message(WARNING "Unknown value ${SC_GENERATE_LEXER_PARSER} supplied for BRLCAD_WORD_SIZE - defaulting to AUTO")
21+
message(WARNING "Valid options are AUTO, ON and OFF")
22+
set(SC_GENERATE_LEXER_PARSER "AUTO" CACHE STRING "Use Perplex, RE2C and Lemon to generate C source code.")
2323
endif (NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "AUTO" AND NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON" AND NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
2424

2525
# If the generators have not been turned off, we need to check for them
2626
if(NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
27-
find_package(LEMON)
28-
find_package(RE2C)
29-
find_package(PERPLEX)
30-
if(LEMON_EXECUTABLE AND LEMON_TEMPLATE AND PERPLEX_EXECUTABLE AND PERPLEX_TEMPLATE AND RE2C_EXECUTABLE)
31-
# Templates may be anywhere - make sure we have a stable path if a relative
32-
# path was specified at CMake time
33-
get_filename_component(lemon_template_fpath "${LEMON_TEMPLATE}" ABSOLUTE)
34-
if(NOT "${lemon_template_fpath}" STREQUAL "${LEMON_TEMPLATE}")
35-
get_filename_component(LEMON_TEMPLATE "${CMAKE_BINARY_DIR}/${LEMON_TEMPLATE}" ABSOLUTE)
36-
endif(NOT "${lemon_template_fpath}" STREQUAL "${LEMON_TEMPLATE}")
37-
get_filename_component(perplex_template_fpath "${PERPLEX_TEMPLATE}" ABSOLUTE)
38-
if(NOT "${perplex_template_fpath}" STREQUAL "${PERPLEX_TEMPLATE}")
39-
get_filename_component(PERPLEX_TEMPLATE "${CMAKE_BINARY_DIR}/${PERPLEX_TEMPLATE}" ABSOLUTE)
40-
endif(NOT "${perplex_template_fpath}" STREQUAL "${PERPLEX_TEMPLATE}")
27+
find_package(LEMON)
28+
find_package(RE2C)
29+
find_package(PERPLEX)
30+
if(LEMON_EXECUTABLE AND LEMON_TEMPLATE AND PERPLEX_EXECUTABLE AND PERPLEX_TEMPLATE AND RE2C_EXECUTABLE)
31+
# Templates may be anywhere - make sure we have a stable path if a relative
32+
# path was specified at CMake time
33+
get_filename_component(lemon_template_fpath "${LEMON_TEMPLATE}" ABSOLUTE)
34+
if(NOT "${lemon_template_fpath}" STREQUAL "${LEMON_TEMPLATE}")
35+
get_filename_component(LEMON_TEMPLATE "${CMAKE_BINARY_DIR}/${LEMON_TEMPLATE}" ABSOLUTE)
36+
endif(NOT "${lemon_template_fpath}" STREQUAL "${LEMON_TEMPLATE}")
37+
get_filename_component(perplex_template_fpath "${PERPLEX_TEMPLATE}" ABSOLUTE)
38+
if(NOT "${perplex_template_fpath}" STREQUAL "${PERPLEX_TEMPLATE}")
39+
get_filename_component(PERPLEX_TEMPLATE "${CMAKE_BINARY_DIR}/${PERPLEX_TEMPLATE}" ABSOLUTE)
40+
endif(NOT "${perplex_template_fpath}" STREQUAL "${PERPLEX_TEMPLATE}")
4141

42-
if(NOT COMMAND LEMON_TARGET)
43-
include(${SC_CMAKE_DIR}/LEMON_Util.cmake)
44-
endif(NOT COMMAND LEMON_TARGET)
45-
if(NOT COMMAND PERPLEX_TARGET)
46-
include(${SC_CMAKE_DIR}/PERPLEX_Util.cmake)
47-
endif(NOT COMMAND PERPLEX_TARGET)
48-
set(SC_GENERATE_LP_SOURCES 1)
49-
else(LEMON_EXECUTABLE AND LEMON_TEMPLATE AND PERPLEX_EXECUTABLE AND PERPLEX_TEMPLATE AND RE2C_EXECUTABLE)
50-
if("${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON")
51-
message(FATAL_ERROR "\nSC_GENERATE_LEXER_PARSER set to ON, but one or more components of the Perplex/RE2C/Lemon toolchain were not found.\n")
52-
else("${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON")
53-
set(SC_GENERATE_LP_SOURCES 0)
54-
endif("${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON")
55-
endif(LEMON_EXECUTABLE AND LEMON_TEMPLATE AND PERPLEX_EXECUTABLE AND PERPLEX_TEMPLATE AND RE2C_EXECUTABLE)
42+
if(NOT COMMAND LEMON_TARGET)
43+
include(${SC_CMAKE_DIR}/LEMON_Util.cmake)
44+
endif(NOT COMMAND LEMON_TARGET)
45+
if(NOT COMMAND PERPLEX_TARGET)
46+
include(${SC_CMAKE_DIR}/PERPLEX_Util.cmake)
47+
endif(NOT COMMAND PERPLEX_TARGET)
48+
set(SC_GENERATE_LP_SOURCES 1)
49+
else(LEMON_EXECUTABLE AND LEMON_TEMPLATE AND PERPLEX_EXECUTABLE AND PERPLEX_TEMPLATE AND RE2C_EXECUTABLE)
50+
if("${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON")
51+
message(FATAL_ERROR "\nSC_GENERATE_LEXER_PARSER set to ON, but one or more components of the Perplex/RE2C/Lemon toolchain were not found.\n")
52+
else("${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON")
53+
set(SC_GENERATE_LP_SOURCES 0)
54+
endif("${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON")
55+
endif(LEMON_EXECUTABLE AND LEMON_TEMPLATE AND PERPLEX_EXECUTABLE AND PERPLEX_TEMPLATE AND RE2C_EXECUTABLE)
5656
else(NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
57-
set(SC_GENERATE_LP_SOURCES 0)
57+
set(SC_GENERATE_LP_SOURCES 0)
5858
endif(NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
5959

6060
# Local Variables:

‎cmake/SC_Run_exp2cxx.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

22
# if oneshot is true, don't run exp2cxx if source files exist. if schema.cc exists, assume others do
33
if( ONESHOT AND EXISTS "${SDIR}/schema.cc" )
4-
message( "WARNING: SC_GENERATE_CXX_ONESHOT is enabled. If generated code has been modified, it will NOT be rewritten!" )
5-
message( "This is ONLY for debugging STEPcode internals!" )
4+
message( "WARNING: SC_GENERATE_CXX_ONESHOT is enabled. If generated code has been modified, it will NOT be rewritten!" )
5+
message( "This is ONLY for debugging STEPcode internals!" )
66
else()
77
execute_process( COMMAND ${EXE} ${EXP}
8-
WORKING_DIRECTORY ${SDIR}
9-
RESULT_VARIABLE _res
10-
OUTPUT_FILE exp2cxx_stdout.txt
11-
ERROR_FILE exp2cxx_stderr.txt
12-
)
8+
WORKING_DIRECTORY ${SDIR}
9+
RESULT_VARIABLE _res
10+
OUTPUT_FILE exp2cxx_stdout.txt
11+
ERROR_FILE exp2cxx_stderr.txt
12+
)
1313
if( NOT "${_res}" STREQUAL "0" )
14-
message( FATAL_ERROR "${EXE} reported an error for ${EXP}.\nsee exp2cxx_stdout.txt and exp2cxx_stderr.txt in ${SDIR} for details." )
14+
message( FATAL_ERROR "${EXE} reported an error for ${EXP}.\nsee exp2cxx_stdout.txt and exp2cxx_stderr.txt in ${SDIR} for details." )
1515
endif( NOT "${_res}" STREQUAL "0" )
1616
# TODO count number of lines in stdout/stderr and tell user?
1717
endif()

0 commit comments

Comments
 (0)