Skip to content

Commit 5fa4b17

Browse files
mpictormpictor
committed
replace all references to SCL with SC in CMake files and code
1 parent dba82e5 commit 5fa4b17

File tree

211 files changed

+1728
-1728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+1728
-1728
lines changed

‎CMakeLists.txt‎

Lines changed: 117 additions & 117 deletions
Large diffs are not rendered by default.

SCL_VERSION.txt renamed to SC_VERSION.txt

File renamed without changes.

cmake/SCL_Utils.cmake renamed to cmake/SC_Utils.cmake

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
MACRO(DEFINE_DLL_EXPORTS libname)
44
IF( MSVC OR BORLAND )
55
if( ${libname} MATCHES "sdai_.*" )
6-
set( export "SCL_SCHEMA_DLL_EXPORTS" )
6+
set( export "SC_SCHEMA_DLL_EXPORTS" )
77
else()
88
STRING(REGEX REPLACE "lib" "" shortname "${libname}")
99
STRING(REGEX REPLACE "step" "" LOWERCORE "${shortname}")
1010
STRING(TOUPPER ${LOWERCORE} UPPER_CORE)
11-
set( export "SCL_${UPPER_CORE}_DLL_EXPORTS" )
11+
set( export "SC_${UPPER_CORE}_DLL_EXPORTS" )
1212
endif()
1313
get_target_property(defs ${libname} COMPILE_DEFINITIONS )
1414
if( defs ) #if no properties, ${defs} will be defs-NOTFOUND which CMake interprets as false
@@ -31,7 +31,7 @@ MACRO( DEFINE_DLL_IMPORTS tgt libs )
3131
STRING(REGEX REPLACE "lib" "" shortname "${lib}")
3232
STRING(REGEX REPLACE "step" "" LOWERCORE "${shortname}")
3333
STRING(TOUPPER ${LOWERCORE} UPPER_CORE)
34-
list( APPEND defs "SCL_${UPPER_CORE}_DLL_IMPORTS" )
34+
list( APPEND defs "SC_${UPPER_CORE}_DLL_IMPORTS" )
3535
endforeach( lib ${libs} )
3636
if( DEFINED defs )
3737
if( defs )
@@ -47,54 +47,54 @@ ENDMACRO( DEFINE_DLL_IMPORTS tgt libs )
4747
# EXCLUDE_FROM_ALL cannot be set on targets that are to be installed,
4848
# so either test the target or install it - but not both
4949
MACRO(EXCLUDE_OR_INSTALL target dest arg_3 )
50-
if( NOT ( ( SCL_ENABLE_TESTING ) AND ( "${arg_3}" STREQUAL "TESTABLE" ) ) )
50+
if( NOT ( ( SC_ENABLE_TESTING ) AND ( "${arg_3}" STREQUAL "TESTABLE" ) ) )
5151
INSTALL(TARGETS ${target} DESTINATION ${dest})
52-
else( NOT ( ( SCL_ENABLE_TESTING ) AND ( "${arg_3}" STREQUAL "TESTABLE" ) ) )
52+
else( NOT ( ( SC_ENABLE_TESTING ) AND ( "${arg_3}" STREQUAL "TESTABLE" ) ) )
5353
set_target_properties( ${target} PROPERTIES EXCLUDE_FROM_ALL ON )
54-
endif( NOT ( ( SCL_ENABLE_TESTING ) AND ( "${arg_3}" STREQUAL "TESTABLE" ) ) )
54+
endif( NOT ( ( SC_ENABLE_TESTING ) AND ( "${arg_3}" STREQUAL "TESTABLE" ) ) )
5555
ENDMACRO(EXCLUDE_OR_INSTALL target dest arg_3 )
5656

57-
#SCL_ADDEXEC( execname "source files" "linked libs" ["TESTABLE"] ["MSVC flag" ...])
57+
#SC_ADDEXEC( execname "source files" "linked libs" ["TESTABLE"] ["MSVC flag" ...])
5858
# optional 4th argument of "TESTABLE", passed to EXCLUDE_OR_INSTALL macro
5959
# optional args can also be used by MSVC-specific code, but it looks like these two uses
6060
# will not conflict because the MSVC args must contain "STRICT"
61-
MACRO(SCL_ADDEXEC execname srcslist libslist)
61+
MACRO(SC_ADDEXEC execname srcslist libslist)
6262
add_executable(${execname} ${srcslist})
6363
target_link_libraries(${execname} ${libslist})
6464
DEFINE_DLL_IMPORTS(${execname} "${libslist}") #add import definitions for all libs that the executable is linked to
6565
EXCLUDE_OR_INSTALL( ${execname} "bin" "${ARGV3}" )
6666
# Enable extra compiler flags if local executables and/or global options dictate
6767
SET(LOCAL_COMPILE_FLAGS "")
6868
FOREACH(extraarg ${ARGN})
69-
IF(${extraarg} MATCHES "STRICT" AND SCL-ENABLE_STRICT)
69+
IF(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
7070
SET(LOCAL_COMPILE_FLAGS "${LOCAL_COMPILE_FLAGS} ${STRICT_FLAGS}")
71-
ENDIF(${extraarg} MATCHES "STRICT" AND SCL-ENABLE_STRICT)
71+
ENDIF(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
7272
ENDFOREACH(extraarg ${ARGN})
7373
IF(LOCAL_COMPILE_FLAGS)
7474
SET_TARGET_PROPERTIES(${execname} PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
7575
ENDIF(LOCAL_COMPILE_FLAGS)
76-
ENDMACRO(SCL_ADDEXEC execname srcslist libslist)
76+
ENDMACRO(SC_ADDEXEC execname srcslist libslist)
7777

78-
#SCL_ADDLIB( libname "source files" "linked libs" ["TESTABLE"] ["MSVC flag" ...])
78+
#SC_ADDLIB( libname "source files" "linked libs" ["TESTABLE"] ["MSVC flag" ...])
7979
# optional 4th argument of "TESTABLE", passed to EXCLUDE_OR_INSTALL macro
8080
# optional args can also be used by MSVC-specific code, but it looks like these two uses
8181
# will not conflict because the MSVC args must contain "STRICT"
82-
MACRO(SCL_ADDLIB libname srcslist libslist)
82+
MACRO(SC_ADDLIB libname srcslist libslist)
8383
STRING(REGEX REPLACE "-framework;" "-framework " libslist "${libslist1}")
84-
IF(SCL_BUILD_SHARED_LIBS)
84+
IF(SC_BUILD_SHARED_LIBS)
8585
add_library(${libname} SHARED ${srcslist})
8686
DEFINE_DLL_EXPORTS(${libname})
8787
if(NOT "${libs}" MATCHES "NONE")
8888
target_link_libraries(${libname} ${libslist})
8989
DEFINE_DLL_IMPORTS(${libname} "${libslist}" )
9090
endif(NOT "${libs}" MATCHES "NONE")
91-
SET_TARGET_PROPERTIES(${libname} PROPERTIES VERSION ${SCL_ABI_VERSION} SOVERSION ${SCL_ABI_SOVERSION} )
91+
SET_TARGET_PROPERTIES(${libname} PROPERTIES VERSION ${SC_ABI_VERSION} SOVERSION ${SC_ABI_SOVERSION} )
9292
EXCLUDE_OR_INSTALL( ${libname} "lib" "${ARGV3}" )
9393
if(APPLE)
9494
set_target_properties(${libname} PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
9595
endif(APPLE)
96-
ENDIF(SCL_BUILD_SHARED_LIBS)
97-
IF(SCL_BUILD_STATIC_LIBS AND NOT MSVC)
96+
ENDIF(SC_BUILD_SHARED_LIBS)
97+
IF(SC_BUILD_STATIC_LIBS AND NOT MSVC)
9898
add_library(${libname}-static STATIC ${srcslist})
9999
DEFINE_DLL_EXPORTS(${libname}-static)
100100
if(NOT ${libs} MATCHES "NONE")
@@ -114,13 +114,13 @@ MACRO(SCL_ADDLIB libname srcslist libslist)
114114
if(APPLE)
115115
set_target_properties(${libname}-static PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
116116
endif(APPLE)
117-
ENDIF(SCL_BUILD_STATIC_LIBS AND NOT MSVC)
117+
ENDIF(SC_BUILD_STATIC_LIBS AND NOT MSVC)
118118
# Enable extra compiler flags if local libraries and/or global options dictate
119119
SET(LOCAL_COMPILE_FLAGS "")
120120
FOREACH(extraarg ${ARGN})
121-
IF(${extraarg} MATCHES "STRICT" AND SCL-ENABLE_STRICT)
121+
IF(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
122122
SET(LOCAL_COMPILE_FLAGS "${LOCAL_COMPILE_FLAGS} ${STRICT_FLAGS}")
123-
ENDIF(${extraarg} MATCHES "STRICT" AND SCL-ENABLE_STRICT)
123+
ENDIF(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
124124
ENDFOREACH(extraarg ${ARGN})
125125
IF(LOCAL_COMPILE_FLAGS)
126126
IF(BUILD_SHARED_LIBS)
@@ -130,4 +130,4 @@ MACRO(SCL_ADDLIB libname srcslist libslist)
130130
SET_TARGET_PROPERTIES(${libname}-static PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
131131
ENDIF(BUILD_STATIC_LIBS AND NOT MSVC)
132132
ENDIF(LOCAL_COMPILE_FLAGS)
133-
ENDMACRO(SCL_ADDLIB libname srcslist libslist)
133+
ENDMACRO(SC_ADDLIB libname srcslist libslist)

cmake/scl_version_string.cmake renamed to cmake/sc_version_string.cmake

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,54 +5,54 @@
55
# http://stackoverflow.com/questions/3780667
66
# http://www.cmake.org/pipermail/cmake/2009-February/027014.html
77

8-
#scl_version_string.h defines scl_version() which returns a pretty commit description and a build timestamp.
8+
#sc_version_string.h defines sc_version() which returns a pretty commit description and a build timestamp.
99

10-
set(SCL_IS_SUBBUILD "@SCL_IS_SUBBUILD@")
10+
set(SC_IS_SUBBUILD "@SC_IS_SUBBUILD@")
1111

12-
set(VERS_FILE ${SOURCE_DIR}/SCL_VERSION.txt )
12+
set(VERS_FILE ${SOURCE_DIR}/SC_VERSION.txt )
1313
if( EXISTS ${SOURCE_DIR}/.git )
1414
find_package(Git QUIET)
1515
if(GIT_FOUND)
1616
execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags RESULT_VARIABLE res_var OUTPUT_VARIABLE GIT_COMMIT_ID )
1717
if( NOT ${res_var} EQUAL 0 )
1818
file( READ ${VERS_FILE} GIT_COMMIT_ID LIMIT 255 )
19-
if(NOT SCL_IS_SUBBUILD)
19+
if(NOT SC_IS_SUBBUILD)
2020
message( WARNING "Git failed (probably no tags in repo). Build will contain revision info from ${VERS_FILE}." )
21-
endif(NOT SCL_IS_SUBBUILD)
21+
endif(NOT SC_IS_SUBBUILD)
2222
endif()
2323
else(GIT_FOUND)
2424
file( READ ${VERS_FILE} GIT_COMMIT_ID LIMIT 255 )
25-
if(NOT SCL_IS_SUBBUILD)
25+
if(NOT SC_IS_SUBBUILD)
2626
message( WARNING "Git not found. Build will contain revision info from ${VERS_FILE}." )
27-
endif(NOT SCL_IS_SUBBUILD)
27+
endif(NOT SC_IS_SUBBUILD)
2828
endif(GIT_FOUND)
2929
else()
3030
file( READ ${VERS_FILE} GIT_COMMIT_ID LIMIT 255 )
31-
if(NOT SCL_IS_SUBBUILD)
31+
if(NOT SC_IS_SUBBUILD)
3232
message( WARNING "Git failed ('.git' not found). Build will contain revision info from ${VERS_FILE}." )
33-
endif(NOT SCL_IS_SUBBUILD)
33+
endif(NOT SC_IS_SUBBUILD)
3434
endif()
3535

3636
string( REPLACE "\n" "" GIT_COMMIT_ID ${GIT_COMMIT_ID} )
3737

38-
set( vstring "//scl_version_string.h - written by cmake. Changes will be lost!\n"
39-
"#ifndef SCL_VERSION_STRING\n"
40-
"#define SCL_VERSION_STRING\n\n"
38+
set( vstring "//sc_version_string.h - written by cmake. Changes will be lost!\n"
39+
"#ifndef SC_VERSION_STRING\n"
40+
"#define SC_VERSION_STRING\n\n"
4141
"/*\n** Returns a string like \"test-1-g5e1fb47, built at TIME on DATE\", where test is the\n"
4242
"** name of the last tagged git revision, 1 is the number of commits since that tag,\n"
4343
"** 'g' is unknown, 5e1fb47 is the first 7 chars of the git sha1 commit id, and TIME\n"
4444
"** and DATE are substituted by the compiler.\n*/\n\n"
45-
"const char* scl_version() {\n"
45+
"const char* sc_version() {\n"
4646
" return \"git commit id ${GIT_COMMIT_ID}, built at \" __TIME__ \" on \" __DATE__ \;\n"
4747
"}\n\n"
4848
"#endif\n"
4949
)
5050

51-
file(WRITE scl_version_string.h.txt ${vstring} )
51+
file(WRITE sc_version_string.h.txt ${vstring} )
5252
# copy the file to the final header only if the version changes
5353
# reduces needless rebuilds
5454
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
55-
scl_version_string.h.txt ${BINARY_DIR}/include/scl_version_string.h)
56-
if(NOT SCL_IS_SUBBUILD)
57-
message("-- scl_version_string.h is up-to-date.")
58-
endif(NOT SCL_IS_SUBBUILD)
55+
sc_version_string.h.txt ${BINARY_DIR}/include/sc_version_string.h)
56+
if(NOT SC_IS_SUBBUILD)
57+
message("-- sc_version_string.h is up-to-date.")
58+
endif(NOT SC_IS_SUBBUILD)

‎ctest_matrix.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ set( CTEST_MEMORYCHECK_COMMAND /usr/bin/valgrind )
88
set( CTEST_INITIAL_CACHE "
99
SITE:STRING=${CTEST_SITE}
1010
BUILDNAME:STRING=${CTEST_BUILD_NAME}
11-
SCL_ENABLE_TESTING:BOOL=ON
12-
SCL_BUILD_TYPE:STRING=Debug
11+
SC_ENABLE_TESTING:BOOL=ON
12+
SC_BUILD_TYPE:STRING=Debug
1313
")
1414

1515

1616
ctest_start(matrix)
1717
ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
18-
ctest_configure( BUILD "${CTEST_BINARY_DIRECTORY}" OPTIONS -DSCL_ENABLE_TESTING=ON )
18+
ctest_configure( BUILD "${CTEST_BINARY_DIRECTORY}" OPTIONS -DSC_ENABLE_TESTING=ON )
1919
ctest_build( BUILD "${CTEST_BINARY_DIRECTORY}" )
2020
message("running tests")
2121
ctest_test( BUILD "${CTEST_BINARY_DIRECTORY}" INCLUDE_LABEL "cpp_schema_....*" )

‎data/CMakeLists.txt‎

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

44
# This function runs fedex on one express file. The generated source goes in a dir
55
# in the build dir, and it is compiled into a library. A p21read executable is
66
# compiled and linked to the lib. p21read is used to test the lib.
77
FUNCTION(BUILD_A_SCHEMA SCHEMA_FILE)
88
if( EXISTS "${CMAKE_BINARY_DIR}/${SCHEMA_FILE}" ) #is it a path relative to build dir?
99
set( SCHEMA_FILE "${CMAKE_BINARY_DIR}/${SCHEMA_FILE}" )
10-
elseif( EXISTS "${SCL_SOURCE_DIR}/data/${SCHEMA_FILE}" ) # path relative to STEPcode/data?
11-
set( SCHEMA_FILE "${SCL_SOURCE_DIR}/data/${SCHEMA_FILE}" )
10+
elseif( EXISTS "${SC_SOURCE_DIR}/data/${SCHEMA_FILE}" ) # path relative to STEPcode/data?
11+
set( SCHEMA_FILE "${SC_SOURCE_DIR}/data/${SCHEMA_FILE}" )
1212
elseif( NOT EXISTS ${SCHEMA_FILE} ) # absolute path
13-
message( FATAL_ERROR "Cannot find ${CMAKE_BINARY_DIR}/${SCHEMA_FILE} or ${SCL_SOURCE_DIR}/data/${SCHEMA_FILE} or ${SCHEMA_FILE}" )
13+
message( FATAL_ERROR "Cannot find ${CMAKE_BINARY_DIR}/${SCHEMA_FILE} or ${SC_SOURCE_DIR}/data/${SCHEMA_FILE} or ${SCHEMA_FILE}" )
1414
endif()
1515

1616
if( IS_DIRECTORY ${SCHEMA_FILE} ) #if it is a dir, look for one .exp file inside
@@ -42,7 +42,7 @@ FUNCTION(BUILD_A_SCHEMA SCHEMA_FILE)
4242
# multiple schemas, each one will use the include dirs from all previous schemas. Since
4343
# one header (schema.h) is always named the same, this will not work. only workaround
4444
# seems to be set_target_properties( <target> PROPERTIES COMPILE_FLAGS <flags> )
45-
set( ${PROJECT_NAME}_COMPILE_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR} -I${SCL_SOURCE_DIR}/src/cldai -I${SCL_SOURCE_DIR}/src/cleditor -I${SCL_SOURCE_DIR}/src/clutils -I${SCHEMA_OUTPUT_DIR} -I${SCL_SOURCE_DIR}/src/clstepcore -I${SCL_SOURCE_DIR}/src/base" )
45+
set( ${PROJECT_NAME}_COMPILE_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR} -I${SC_SOURCE_DIR}/src/cldai -I${SC_SOURCE_DIR}/src/cleditor -I${SC_SOURCE_DIR}/src/clutils -I${SCHEMA_OUTPUT_DIR} -I${SC_SOURCE_DIR}/src/clstepcore -I${SC_SOURCE_DIR}/src/base" )
4646

4747
add_custom_target( generate_cpp_${SCHEMA_SHORT_NAME} SOURCES ${FEDEX_OUT} )
4848
add_custom_command( OUTPUT ${SCHEMA_OUTPUT_DIR}
@@ -55,22 +55,22 @@ FUNCTION(BUILD_A_SCHEMA SCHEMA_FILE)
5555
COMMENT "Running fedex_plus for ${SCHEMA_SHORT_NAME}..."
5656
VERBATIM )
5757

58-
if( SCL_ENABLE_COVERAGE AND NOT SC_COVER_SCHEMAS )
58+
if( SC_ENABLE_COVERAGE AND NOT SC_COVER_SCHEMAS )
5959
# Coverage will always be sparse on schema libs. Compiling the libs with the -fprofile-arcs and
6060
# -ftest-coverage is extremely slow. We can avoid that by temporarily changing build type to release.
6161
set( PREV_BUILD_TYPE ${CMAKE_BUILD_TYPE} )
6262
set( CMAKE_BUILD_TYPE "Release" )
63-
endif( SCL_ENABLE_COVERAGE AND NOT SC_COVER_SCHEMAS )
63+
endif( SC_ENABLE_COVERAGE AND NOT SC_COVER_SCHEMAS )
6464

6565
# if testing is enabled, "TESTABLE" sets property EXCLUDE_FROM_ALL and prevents installation
66-
SCL_ADDLIB( ${PROJECT_NAME} "${FEDEX_OUT}" "stepdai;stepcore;express;stepeditor;steputils;base" "TESTABLE" )
66+
SC_ADDLIB( ${PROJECT_NAME} "${FEDEX_OUT}" "stepdai;stepcore;express;stepeditor;steputils;base" "TESTABLE" )
6767
add_dependencies( ${PROJECT_NAME} generate_cpp_${SCHEMA_SHORT_NAME} )
6868
set_target_properties( ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
6969
${${PROJECT_NAME}_COMPILE_FLAGS} )
7070

71-
if( SCL_ENABLE_COVERAGE AND NOT SC_COVER_SCHEMAS )
71+
if( SC_ENABLE_COVERAGE AND NOT SC_COVER_SCHEMAS )
7272
set( CMAKE_BUILD_TYPE ${PREV_BUILD_TYPE} )
73-
endif( SCL_ENABLE_COVERAGE AND NOT SC_COVER_SCHEMAS )
73+
endif( SC_ENABLE_COVERAGE AND NOT SC_COVER_SCHEMAS )
7474

7575
add_test( NAME generate_cpp_${SCHEMA_SHORT_NAME}
7676
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
@@ -96,26 +96,26 @@ FUNCTION(BUILD_A_SCHEMA SCHEMA_FILE)
9696
set_tests_properties( build_lazy_cpp_${PROJECT_NAME} build_cpp_${PROJECT_NAME} PROPERTIES DEPENDS generate_cpp_${SCHEMA_SHORT_NAME} LABELS cpp_schema_build )
9797
endif(NOT WIN32)
9898

99-
SCL_ADDEXEC( p21read_${PROJECT_NAME} "${SCL_SOURCE_DIR}/src/test/p21read/p21read.cc" "${PROJECT_NAME};base" "TESTABLE" )
100-
if(NOT WIN32)
101-
SCL_ADDEXEC( lazy_${PROJECT_NAME} "${SCL_SOURCE_DIR}/src/cllazyfile/lazy_test.cc" "${PROJECT_NAME};steplazyfile;stepeditor" "TESTABLE" )
102-
endif(NOT WIN32)
99+
SC_ADDEXEC( p21read_${PROJECT_NAME} "${SC_SOURCE_DIR}/src/test/p21read/p21read.cc" "${PROJECT_NAME};base" "TESTABLE" )
100+
if(NOT WIN32)
101+
SC_ADDEXEC( lazy_${PROJECT_NAME} "${SC_SOURCE_DIR}/src/cllazyfile/lazy_test.cc" "${PROJECT_NAME};steplazyfile;stepeditor" "TESTABLE" )
102+
endif(NOT WIN32)
103103
add_dependencies( p21read_${PROJECT_NAME} version_string )
104104
if(NOT WIN32)
105105
add_dependencies( lazy_${PROJECT_NAME} version_string )
106106
endif(NOT WIN32)
107107
set_target_properties( p21read_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
108108
${${PROJECT_NAME}_COMPILE_FLAGS} )
109109
if(NOT WIN32)
110-
set_target_properties( lazy_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${${PROJECT_NAME}_COMPILE_FLAGS} -I${SCL_SOURCE_DIR}/src/base/judy/src" )
110+
set_target_properties( lazy_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${${PROJECT_NAME}_COMPILE_FLAGS} -I${SC_SOURCE_DIR}/src/base/judy/src" )
111111
endif(NOT WIN32)
112112

113113

114114
#add user-defined executables
115115
foreach( src ${SC_SDAI_ADDITIONAL_EXES_SRCS} )
116116
get_filename_component( name ${src} NAME_WE )
117117
get_filename_component( path ${src} ABSOLUTE )
118-
SCL_ADDEXEC( ${name}_${PROJECT_NAME} "${src}" "${PROJECT_NAME};base" "TESTABLE" )
118+
SC_ADDEXEC( ${name}_${PROJECT_NAME} "${src}" "${PROJECT_NAME};base" "TESTABLE" )
119119
add_dependencies( ${name}_${PROJECT_NAME} version_string )
120120
set_target_properties( ${name}_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
121121
"${${PROJECT_NAME}_COMPILE_FLAGS} -I${path}" )
@@ -142,16 +142,16 @@ ENDFUNCTION(BUILD_A_SCHEMA)
142142

143143
#----------------------------------------------------------------------------------------------------
144144

145-
if( DEFINED SCL_BUILD_SCHEMAS )
145+
if( DEFINED SC_BUILD_SCHEMAS )
146146
foreach( src ${SC_SDAI_ADDITIONAL_EXES_SRCS} )
147147
get_filename_component( name ${src} NAME_WE )
148148
message( STATUS "Additional SDAI executable: ${name}" )
149149
endforeach( src ${SC_SDAI_ADDITIONAL_EXES_SRCS} )
150150

151-
if( SCL_BUILD_SCHEMAS STREQUAL "ALL" )
152-
file( GLOB_RECURSE SCL_BUILD_SCHEMAS ${SCL_SOURCE_DIR}/data/*.exp )
151+
if( SC_BUILD_SCHEMAS STREQUAL "ALL" )
152+
file( GLOB_RECURSE SC_BUILD_SCHEMAS ${SC_SOURCE_DIR}/data/*.exp )
153153
endif()
154-
foreach( ap ${SCL_BUILD_SCHEMAS} )
154+
foreach( ap ${SC_BUILD_SCHEMAS} )
155155
BUILD_A_SCHEMA( ${ap} )
156156
endforeach()
157157
endif()

‎doc/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SET(scl_MANS
1+
SET(sc_MANS
22
man/man1/dataprobe.1
33
man/man1/fedex.1
44
man/man1/fedex_plus.1
@@ -10,5 +10,5 @@ if(NOT DEFINED MAN_DIR)
1010
endif(NOT DEFINED MAN_DIR)
1111

1212
IF(NOT WIN32)
13-
INSTALL(FILES ${scl_MANS} DESTINATION ${MAN_DIR}/man1)
13+
INSTALL(FILES ${sc_MANS} DESTINATION ${MAN_DIR}/man1)
1414
ENDIF(NOT WIN32)

0 commit comments

Comments
 (0)