Skip to content

Commit 10fb741

Browse files
starseekermpictor
starseeker
authored and
mpictor
committed
More whitespace and case tweaks
1 parent f4ac673 commit 10fb741

16 files changed

Lines changed: 198 additions & 201 deletions

File tree

‎data/CMakeLists.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# To build one or more schemas, configure with
22
# 'cmake -DSC_BUILD_SCHEMAS="path/to/schema.exp;path/to/schema2.exp"
33

4-
if( NOT "${SC_BUILD_SCHEMAS}" STREQUAL "" )
5-
include( ${SC_CMAKE_DIR}/schema_scanner/schemaScanner.cmake )
6-
foreach( src ${SC_SDAI_ADDITIONAL_EXES_SRCS} )
7-
get_filename_component( name ${src} NAME_WE )
8-
message( STATUS "Additional SDAI executable: ${name}" )
9-
endforeach( src ${SC_SDAI_ADDITIONAL_EXES_SRCS} )
4+
if(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
5+
include(${SC_CMAKE_DIR}/schema_scanner/schemaScanner.cmake)
6+
foreach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
7+
get_filename_component(name ${src} NAME_WE)
8+
message(STATUS "Additional SDAI executable: ${name}")
9+
endforeach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
1010

11-
if( SC_BUILD_SCHEMAS STREQUAL "ALL" )
12-
file( GLOB_RECURSE SC_BUILD_SCHEMAS ${SC_SOURCE_DIR}/data/*.exp )
11+
if(SC_BUILD_SCHEMAS STREQUAL "ALL")
12+
file(GLOB_RECURSE SC_BUILD_SCHEMAS ${SC_SOURCE_DIR}/data/*.exp)
1313
endif()
14-
foreach( FILE ${SC_BUILD_SCHEMAS} )
14+
foreach(FILE ${SC_BUILD_SCHEMAS})
1515
# figure out an absolute path to the file
16-
LOCATE_SCHEMA( ${FILE} abspath )
17-
SCHEMA_CMLIST( ${abspath} )
16+
LOCATE_SCHEMA(${FILE} abspath)
17+
SCHEMA_CMLIST(${abspath})
1818
endforeach()
19-
endif( NOT "${SC_BUILD_SCHEMAS}" STREQUAL "" )
19+
endif(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
2020

2121
# Local Variables:
2222
# tab-width: 8

‎doc/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SET(sc_MANS
1+
set(sc_MANS
22
man/man1/fedex.1
33
man/man1/exp2cxx.1
44
)
@@ -7,9 +7,9 @@ if(NOT DEFINED MAN_DIR)
77
set(MAN_DIR share/man)
88
endif(NOT DEFINED MAN_DIR)
99

10-
IF(NOT WIN32)
11-
INSTALL(FILES ${sc_MANS} DESTINATION ${MAN_DIR}/man1)
12-
ENDIF(NOT WIN32)
10+
if(NOT WIN32)
11+
install(FILES ${sc_MANS} DESTINATION ${MAN_DIR}/man1)
12+
endif(NOT WIN32)
1313

1414
# Local Variables:
1515
# tab-width: 8

‎example/ap203min/CMakeLists.txt‎

Lines changed: 39 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,59 +5,59 @@
55
# freely copied in part or in full for any purpose. No acknowledgment is required
66
# for the use of this file.
77
#
8-
PROJECT( AP203Minimum )
9-
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
8+
project(AP203Minimum)
9+
cmake_minimum_required(VERSION 2.8)
1010

1111
# Set STEPCODE_ROOT_DIR to point to the root of the STEPcode source tree.
12-
if( NOT DEFINED STEPCODE_ROOT_DIR )
13-
message( FATAL_ERROR "STEPCODE_ROOT_DIR is not defined! Set via cmake-gui or on command line:\n cmake .. -DSTEPCODE_ROOT_DIR=/path/to/sc" )
14-
endif( NOT DEFINED STEPCODE_ROOT_DIR )
12+
if(NOT DEFINED STEPCODE_ROOT_DIR)
13+
message(FATAL_ERROR "STEPCODE_ROOT_DIR is not defined! Set via cmake-gui or on command line:\n cmake .. -DSTEPCODE_ROOT_DIR=/path/to/sc")
14+
endif(NOT DEFINED STEPCODE_ROOT_DIR)
1515

1616
# STEPCODE_ROOT_DIR is relative or absolute path?
17-
if( EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/SC_VERSION.txt" )
18-
set( STEPCODE_ROOT_DIR "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}" )
19-
message( "** STEPCODE_ROOT_DIR is a relative path; converted to absolute path: ${STEPCODE_ROOT_DIR}." )
17+
if(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
18+
set(STEPCODE_ROOT_DIR "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}")
19+
message("** STEPCODE_ROOT_DIR is a relative path; converted to absolute path: ${STEPCODE_ROOT_DIR}.")
2020
else()
21-
if( NOT EXISTS "${STEPCODE_ROOT_DIR}/SC_VERSION.txt" )
22-
message( FATAL_ERROR "**** Cannot locate STEPCODE_ROOT_DIR - try an absolute path." )
23-
endif( NOT EXISTS "${STEPCODE_ROOT_DIR}/SC_VERSION.txt" )
24-
endif( EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/SC_VERSION.txt" )
21+
if(NOT EXISTS "${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
22+
message(FATAL_ERROR "**** Cannot locate STEPCODE_ROOT_DIR - try an absolute path.")
23+
endif(NOT EXISTS "${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
24+
endif(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
2525

2626

2727
# Use STEPcode as library, but build from this build process.
28-
set( SC_IS_SUBBUILD TRUE )
28+
set(SC_IS_SUBBUILD TRUE)
2929

3030
# Build type, DEBUG or RELEASE
31-
if( NOT DEFINED CMAKE_BUILD_TYPE )
32-
set( CMAKE_BUILD_TYPE Debug )
33-
endif( NOT DEFINED CMAKE_BUILD_TYPE )
34-
set( SC_BUILD_TYPE ${CMAKE_BUILD_TYPE} )
31+
if(NOT DEFINED CMAKE_BUILD_TYPE)
32+
set(CMAKE_BUILD_TYPE Debug)
33+
endif(NOT DEFINED CMAKE_BUILD_TYPE)
34+
set(SC_BUILD_TYPE ${CMAKE_BUILD_TYPE})
3535

3636
# Path to STEPcode
37-
set( STEPCODE_BUILD_DIR ${CMAKE_BINARY_DIR}/sc CACHE PATH "STEPcode build subdir" )
37+
set(STEPCODE_BUILD_DIR ${CMAKE_BINARY_DIR}/sc CACHE PATH "STEPcode build subdir")
3838

3939
# STEP schema to build and link against.
40-
set( SCHEMA ap203 )
41-
set( SC_BUILD_SCHEMAS ${SCHEMA} CACHE INTERNAL "Schema, internal, immutable" FORCE )
40+
set(SCHEMA ap203)
41+
set(SC_BUILD_SCHEMAS ${SCHEMA} CACHE INTERNAL "Schema, internal, immutable" FORCE)
4242

4343
# Parse out schema name and library.
44-
set( SCHEMA_PATH "${STEPCODE_ROOT_DIR}/data/${SCHEMA}/*.exp" )
45-
file( GLOB SCHEMA_FILE "${SCHEMA_PATH}" )
44+
set(SCHEMA_PATH "${STEPCODE_ROOT_DIR}/data/${SCHEMA}/*.exp")
45+
file(GLOB SCHEMA_FILE "${SCHEMA_PATH}")
4646

47-
if( NOT EXISTS ${SCHEMA_FILE} )
48-
message( FATAL_ERROR "Cannot find the schema; cannot continue. Looked for ${SCHEMA_PATH} from ${CMAKE_CURRENT_LIST_DIR}" )
49-
endif( NOT EXISTS ${SCHEMA_FILE} )
47+
if(NOT EXISTS ${SCHEMA_FILE})
48+
message(FATAL_ERROR "Cannot find the schema; cannot continue. Looked for ${SCHEMA_PATH} from ${CMAKE_CURRENT_LIST_DIR}")
49+
endif(NOT EXISTS ${SCHEMA_FILE})
5050

5151

52-
get_filename_component( SCHEMA_SN ${SCHEMA_FILE} NAME )
53-
string( REGEX REPLACE "\(.*\).[Ee][Xx][Pp]" "\\1" SCHEMA_LINK_NAME ${SCHEMA_SN} )
54-
set( STEPCODE_LIBRARIES base stepcore stepeditor stepdai steputils sdai_${SCHEMA_LINK_NAME} )
52+
get_filename_component(SCHEMA_SN ${SCHEMA_FILE} NAME)
53+
string(REGEX REPLACE "\(.*\).[Ee][Xx][Pp]" "\\1" SCHEMA_LINK_NAME ${SCHEMA_SN})
54+
set(STEPCODE_LIBRARIES base stepcore stepeditor stepdai steputils sdai_${SCHEMA_LINK_NAME})
5555

5656
# Add STEPCode project to CMake build.
57-
add_subdirectory( ${STEPCODE_ROOT_DIR} "${CMAKE_CURRENT_BINARY_DIR}/sc" EXCLUDE_FROM_ALL )
57+
add_subdirectory(${STEPCODE_ROOT_DIR} "${CMAKE_CURRENT_BINARY_DIR}/sc" EXCLUDE_FROM_ALL)
5858

5959
# Set up STEPcode include directories.
60-
set( STEPCODE_INCLUDE_DIR
60+
set(STEPCODE_INCLUDE_DIR
6161
${STEPCODE_ROOT_DIR}/src/base
6262
${STEPCODE_ROOT_DIR}/src/clstepcore
6363
${STEPCODE_ROOT_DIR}/src/cldai
@@ -66,29 +66,26 @@ set( STEPCODE_INCLUDE_DIR
6666
${STEPCODE_BUILD_DIR}/include
6767
${STEPCODE_ROOT_DIR}/include
6868
${CMAKE_BINARY_DIR}
69-
)
69+
)
7070

7171
# Reset sane values for build destination. Otherwise, everything ends up in ${CMAKE_BINARY_DIR}/sc
72-
set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
73-
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
72+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
73+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
7474

7575
include_directories(
7676
${STEPCODE_INCLUDE_DIR}
77-
)
77+
)
7878

7979
# Application sources and headers
80-
set( SRCS
81-
ap203min.cpp
82-
)
80+
set(SRCS ap203min.cpp)
8381

84-
set( HDRS
85-
)
82+
set(HDRS )
8683

87-
add_executable( ${PROJECT_NAME} ${SRCS} ${HDRS} )
84+
add_executable(${PROJECT_NAME} ${SRCS} ${HDRS})
8885

89-
target_link_libraries( ${PROJECT_NAME} ${STEPCODE_LIBRARIES} )
86+
target_link_libraries(${PROJECT_NAME} ${STEPCODE_LIBRARIES})
9087

91-
set_target_properties( ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-I${STEPCODE_BUILD_DIR}/data/${SCHEMA_LINK_NAME}" )
88+
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-I${STEPCODE_BUILD_DIR}/data/${SCHEMA_LINK_NAME}")
9289

9390
# Local Variables:
9491
# tab-width: 8

‎include/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SET(express_HDRS
1+
set(express_HDRS
22
express/alg.h
33
express/basic.h
44
express/caseitem.h
@@ -24,7 +24,7 @@ SET(express_HDRS
2424
install(FILES ${express_HDRS}
2525
DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/express)
2626

27-
SET(exppp_HDRS
27+
set(exppp_HDRS
2828
exppp/exppp.h
2929
)
3030
install(FILES ${exppp_HDRS}

‎src/base/CMakeLists.txt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set(SC_BASE_SOURCES
55
sc_getopt.cc
66
sc_benchmark.cc
77
sc_mkdir.c
8-
)
8+
)
99

1010
set(SC_BASE_HDRS
1111
sc_benchmark.h
@@ -14,14 +14,14 @@ set(SC_BASE_HDRS
1414
sc_trace_fprintf.h
1515
sc_stdbool.h
1616
sc_mkdir.h
17-
)
17+
)
1818

1919
if(MINGW OR MSVC OR BORLAND)
20-
add_definitions( -DSC_BASE_DLL_EXPORTS )
20+
add_definitions(-DSC_BASE_DLL_EXPORTS)
2121
endif()
2222

2323
if (${SC_MEMMGR_ENABLE_CHECKS})
24-
add_definitions( -DSC_MEMMGR_ENABLE_CHECKS )
24+
add_definitions(-DSC_MEMMGR_ENABLE_CHECKS)
2525
endif()
2626

2727
SC_ADDLIB(base "${SC_BASE_SOURCES}" "")
@@ -30,18 +30,18 @@ if(MINGW OR MSVC OR BORLAND)
3030
target_link_libraries(base psapi.lib)
3131
endif()
3232

33-
if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src" )
34-
message( "Judy array source code not found. Downloading (don't sweat, it's public domain)..." )
35-
file( DOWNLOAD "http://github.com/mpictor/judy-template/archive/master.tar.gz"
36-
"${CMAKE_CURRENT_SOURCE_DIR}/judy.tar.gz" SHOW_PROGRESS )
33+
if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src")
34+
message("Judy array source code not found. Downloading (don't sweat, it's public domain)...")
35+
file(DOWNLOAD "http://github.com/mpictor/judy-template/archive/master.tar.gz"
36+
"${CMAKE_CURRENT_SOURCE_DIR}/judy.tar.gz" SHOW_PROGRESS)
3737
execute_process(
3838
COMMAND ${CMAKE_COMMAND} -E tar xzf "${CMAKE_CURRENT_SOURCE_DIR}/judy.tar.gz"
3939
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/"
40-
)
41-
file( RENAME judy-template-master judy )
42-
file( REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/judy.tar.gz" )
43-
message( "Judy array source code extracted." )
44-
endif(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src" )
40+
)
41+
file(RENAME judy-template-master judy)
42+
file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/judy.tar.gz")
43+
message("Judy array source code extracted.")
44+
endif(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src")
4545

4646
install(FILES ${SC_BASE_HDRS}
4747
DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/base)

‎src/clstepcore/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ set(LIBSTEPCORE_SRCS
3434
needFunc.cc
3535
)
3636

37-
SET(SC_CLSTEPCORE_HDRS
37+
set(SC_CLSTEPCORE_HDRS
3838
baseType.h
3939
complexSupport.h
4040
dictdefs.h
@@ -73,9 +73,9 @@ SC_ADDLIB(stepcore "${LIBSTEPCORE_SRCS}" "steputils;stepdai;base")
7373
install(FILES ${SC_CLSTEPCORE_HDRS}
7474
DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/clstepcore)
7575

76-
IF(SC_ENABLE_TESTING)
77-
ADD_SUBDIRECTORY( test )
78-
ENDIF(SC_ENABLE_TESTING)
76+
if(SC_ENABLE_TESTING)
77+
add_subdirectory(test)
78+
endif(SC_ENABLE_TESTING)
7979

8080
# Local Variables:
8181
# tab-width: 8

‎src/clutils/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set(LIBSTEPUTILS_SRCS
99
errordesc.cc
1010
)
1111

12-
SET(SC_CLUTILS_HDRS
12+
set(SC_CLUTILS_HDRS
1313
dirobj.h
1414
errordesc.h
1515
gennodearray.h
@@ -27,9 +27,9 @@ include_directories(
2727

2828
SC_ADDLIB(steputils "${LIBSTEPUTILS_SRCS}" "base")
2929

30-
IF(MINGW OR MSVC OR BORLAND)
31-
TARGET_LINK_LIBRARIES(steputils shlwapi.lib)
32-
ENDIF()
30+
if(MINGW OR MSVC OR BORLAND)
31+
target_link_libraries(steputils shlwapi.lib)
32+
endif()
3333

3434
install(FILES ${SC_CLUTILS_HDRS}
3535
DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/clutils)

‎src/exp2cxx/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ include_directories(
3838

3939
SC_ADDEXEC(exp2cxx "${exp2cxx_SOURCES}" "libexppp;express;base")
4040

41-
add_dependencies( exp2cxx version_string )
41+
add_dependencies(exp2cxx version_string)
4242

43-
if( SC_ENABLE_TESTING )
43+
if(SC_ENABLE_TESTING)
4444
add_subdirectory(test)
45-
endif( SC_ENABLE_TESTING )
45+
endif(SC_ENABLE_TESTING)
4646

4747
# Local Variables:
4848
# tab-width: 8

‎src/exp2cxx/test/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
#tests specific to exp2cxx
22

3-
set( unitary_dir ${SC_SOURCE_DIR}/test/unitary_schemas )
3+
set(unitary_dir ${SC_SOURCE_DIR}/test/unitary_schemas)
44

5-
add_test( NAME test_exp2cxx_unique_qualifiers
5+
add_test(NAME test_exp2cxx_unique_qualifiers
66
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
77
COMMAND ${CMAKE_COMMAND} -DEXE=$<TARGET_FILE:exp2cxx>
88
-DINFILE=${unitary_dir}/unique_qualifiers.exp
99
-P ${CMAKE_CURRENT_SOURCE_DIR}/unique_qualifiers.cmake
10-
)
10+
)
1111

12-
add_test( NAME test_exp2cxx_inverse_qualifiers
12+
add_test(NAME test_exp2cxx_inverse_qualifiers
1313
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
1414
COMMAND ${CMAKE_COMMAND} -DEXE=$<TARGET_FILE:exp2cxx>
1515
-DINFILE=${unitary_dir}/inverse_qualifiers.exp
1616
-P ${CMAKE_CURRENT_SOURCE_DIR}/inverse_qualifiers.cmake
17-
)
18-
set_tests_properties( test_exp2cxx_unique_qualifiers test_exp2cxx_inverse_qualifiers PROPERTIES DEPENDS exp2cxx )
17+
)
18+
set_tests_properties(test_exp2cxx_unique_qualifiers test_exp2cxx_inverse_qualifiers PROPERTIES DEPENDS exp2cxx)
1919

2020
# Local Variables:
2121
# tab-width: 8

‎src/exp2python/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ if(SC_PYTHON_GENERATOR)
55
${SC_SOURCE_DIR}/include/exppp
66
${SC_SOURCE_DIR}/include/express
77
${SC_SOURCE_DIR}/src/base
8-
)
8+
)
99

10-
add_definitions( -DHAVE_CONFIG_H )
10+
add_definitions(-DHAVE_CONFIG_H)
1111

1212
set(exp2python_SOURCES
1313
src/classes_misc_python.c
@@ -29,10 +29,10 @@ if(SC_PYTHON_GENERATOR)
2929
../exp2cxx/trynext.cc
3030
../exp2cxx/write.cc
3131
../exp2cxx/print.cc
32-
)
32+
)
3333
SC_ADDEXEC(exp2python "${exp2python_SOURCES}" "libexppp;express;base")
3434

35-
add_dependencies( exp2python version_string )
35+
add_dependencies(exp2python version_string)
3636
endif(SC_PYTHON_GENERATOR)
3737

3838
# Local Variables:

0 commit comments

Comments
 (0)