Skip to content

Commit df2bb7e

Browse files
starseekerstarseeker
committed
Use semicolons in lists for SCL_ADD macros as well.
1 parent 579a0eb commit df2bb7e

9 files changed

Lines changed: 13 additions & 17 deletions

File tree

‎cmake/SCL_Utils.cmake‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ ENDMACRO(EXCLUDE_OR_INSTALL target dest arg_3 )
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 srcs libs)
62-
STRING(REGEX REPLACE " " ";" srcslist "${srcs}")
63-
STRING(REGEX REPLACE " " ";" libslist "${libs}")
61+
MACRO(SCL_ADDEXEC execname srcslist libslist)
6462
add_executable(${execname} ${srcslist})
6563
target_link_libraries(${execname} ${libslist})
6664
DEFINE_DLL_IMPORTS(${execname} "${libslist}") #add import definitions for all libs that the executable is linked to
@@ -75,15 +73,13 @@ MACRO(SCL_ADDEXEC execname srcs libs)
7573
IF(LOCAL_COMPILE_FLAGS)
7674
SET_TARGET_PROPERTIES(${execname} PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
7775
ENDIF(LOCAL_COMPILE_FLAGS)
78-
ENDMACRO(SCL_ADDEXEC execname srcs libs)
76+
ENDMACRO(SCL_ADDEXEC execname srcslist libslist)
7977

8078
#SCL_ADDLIB( libname "source files" "linked libs" ["TESTABLE"] ["MSVC flag" ...])
8179
# optional 4th argument of "TESTABLE", passed to EXCLUDE_OR_INSTALL macro
8280
# optional args can also be used by MSVC-specific code, but it looks like these two uses
8381
# will not conflict because the MSVC args must contain "STRICT"
84-
MACRO(SCL_ADDLIB libname srcs libs)
85-
STRING(REGEX REPLACE " " ";" srcslist "${srcs}")
86-
STRING(REGEX REPLACE " " ";" libslist1 "${libs}")
82+
MACRO(SCL_ADDLIB libname srcslist libslist)
8783
STRING(REGEX REPLACE "-framework;" "-framework " libslist "${libslist1}")
8884
IF(SCL_BUILD_SHARED_LIBS)
8985
add_library(${libname} SHARED ${srcslist})
@@ -134,4 +130,4 @@ MACRO(SCL_ADDLIB libname srcs libs)
134130
SET_TARGET_PROPERTIES(${libname}-static PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
135131
ENDIF(BUILD_STATIC_LIBS AND NOT MSVC)
136132
ENDIF(LOCAL_COMPILE_FLAGS)
137-
ENDMACRO(SCL_ADDLIB libname srcs libs)
133+
ENDMACRO(SCL_ADDLIB libname srcslist libslist)

‎data/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ FUNCTION(BUILD_A_SCHEMA SCHEMA_FILE)
8585
set_tests_properties( generate_cpp_${SCHEMA_SHORT_NAME} PROPERTIES LABELS cpp_schema_gen )
8686
set_tests_properties( build_cpp_${PROJECT_NAME} PROPERTIES DEPENDS generate_cpp_${SCHEMA_SHORT_NAME} LABELS cpp_schema_build )
8787

88-
SCL_ADDEXEC( p21read_${PROJECT_NAME} "${SCL_SOURCE_DIR}/src/test/p21read/p21read.cc" "${PROJECT_NAME} base" )
88+
SCL_ADDEXEC( p21read_${PROJECT_NAME} "${SCL_SOURCE_DIR}/src/test/p21read/p21read.cc" "${PROJECT_NAME};base" )
8989
add_dependencies( p21read_${PROJECT_NAME} version_string )
9090
set_target_properties( p21read_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
9191
${${PROJECT_NAME}_COMPILE_FLAGS} )

‎src/cldai/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ include_directories(
3434
${SCL_SOURCE_DIR}/src/clutils
3535
)
3636

37-
SCL_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils base")
37+
SCL_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils;base")

‎src/cleditor/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ include_directories(
4141
${SCL_SOURCE_DIR}/src/clutils
4242
)
4343

44-
SCL_ADDLIB(stepeditor "${LIBSTEPEDITOR_SRCS}" "stepcore stepdai steputils base")
44+
SCL_ADDLIB(stepeditor "${LIBSTEPEDITOR_SRCS}" "stepcore;stepdai;steputils;base")

‎src/clstepcore/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ include_directories(
5353
${SCL_SOURCE_DIR}/src/clutils
5454
)
5555

56-
SCL_ADDLIB(stepcore "${LIBSTEPCORE_SRCS}" "express steputils stepdai base")
56+
SCL_ADDLIB(stepcore "${LIBSTEPCORE_SRCS}" "express;steputils;stepdai;base")

‎src/exppp/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if(BORLAND)
1717
add_definitions( -D__STDC__ )
1818
endif()
1919

20-
SCL_ADDLIB(libexppp "${LIBEXPPP_SOURCES}" "express base")
20+
SCL_ADDLIB(libexppp "${LIBEXPPP_SOURCES}" "express;base")
2121
set_target_properties(libexppp PROPERTIES PREFIX "")
2222

23-
SCL_ADDEXEC(exppp "${EXPPP_SOURCES}" "libexppp express base")
23+
SCL_ADDEXEC(exppp "${EXPPP_SOURCES}" "libexppp;express;base")

‎src/express/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ SET(EXPRESS_PRIVATE_HDRS
115115
SCL_ADDLIB(express "${EXPRESS_SOURCES}" "base")
116116
add_dependencies(express express_verify)
117117
add_dependencies(express version_string)
118-
SCL_ADDEXEC("check-express" "${CHECK_EXPRESS_SOURCES}" "express base" )
118+
SCL_ADDEXEC("check-express" "${CHECK_EXPRESS_SOURCES}" "express;base" )
119119

120120
# Local Variables:
121121
# tab-width: 8

‎src/fedex_plus/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ include_directories(
3131
${SCL_SOURCE_DIR}/src/base
3232
)
3333

34-
SCL_ADDEXEC(fedex_plus "${fedex_plus_SOURCES}" "libexppp express base")
34+
SCL_ADDEXEC(fedex_plus "${fedex_plus_SOURCES}" "libexppp;express;base")
3535

3636
add_dependencies( fedex_plus version_string )

‎src/fedex_python/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set(fedex_python_SOURCES
3131
../fedex_plus/write.cc
3232
../fedex_plus/print.cc
3333
)
34-
SCL_ADDEXEC(fedex_python "${fedex_python_SOURCES}" "libexppp express base")
34+
SCL_ADDEXEC(fedex_python "${fedex_python_SOURCES}" "libexppp;express;base")
3535

3636
add_dependencies( fedex_python version_string )
3737
endif(SCL_PYTHON_GENERATOR)

0 commit comments

Comments
 (0)