Revision: 51716
http://brlcad.svn.sourceforge.net/brlcad/?rev=51716&view=rev
Author: starseeker
Date: 2012-07-30 12:46:46 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Use semicolons in lists for SCL_ADD macros as well.
Modified Paths:
--------------
brlcad/trunk/src/other/step/cmake/SCL_Utils.cmake
brlcad/trunk/src/other/step/data/CMakeLists.txt
brlcad/trunk/src/other/step/src/cldai/CMakeLists.txt
brlcad/trunk/src/other/step/src/cleditor/CMakeLists.txt
brlcad/trunk/src/other/step/src/clstepcore/CMakeLists.txt
brlcad/trunk/src/other/step/src/exppp/CMakeLists.txt
brlcad/trunk/src/other/step/src/express/CMakeLists.txt
brlcad/trunk/src/other/step/src/fedex_plus/CMakeLists.txt
brlcad/trunk/src/other/step/src/fedex_python/CMakeLists.txt
Modified: brlcad/trunk/src/other/step/cmake/SCL_Utils.cmake
===================================================================
--- brlcad/trunk/src/other/step/cmake/SCL_Utils.cmake 2012-07-30 12:41:29 UTC
(rev 51715)
+++ brlcad/trunk/src/other/step/cmake/SCL_Utils.cmake 2012-07-30 12:46:46 UTC
(rev 51716)
@@ -58,9 +58,7 @@
# optional 4th argument of "TESTABLE", passed to EXCLUDE_OR_INSTALL macro
# optional args can also be used by MSVC-specific code, but it looks like
these two uses
# will not conflict because the MSVC args must contain "STRICT"
-MACRO(SCL_ADDEXEC execname srcs libs)
- STRING(REGEX REPLACE " " ";" srcslist "${srcs}")
- STRING(REGEX REPLACE " " ";" libslist "${libs}")
+MACRO(SCL_ADDEXEC execname srcslist libslist)
add_executable(${execname} ${srcslist})
target_link_libraries(${execname} ${libslist})
DEFINE_DLL_IMPORTS(${execname} "${libslist}") #add import definitions for
all libs that the executable is linked to
@@ -75,15 +73,13 @@
IF(LOCAL_COMPILE_FLAGS)
SET_TARGET_PROPERTIES(${execname} PROPERTIES COMPILE_FLAGS
${LOCAL_COMPILE_FLAGS})
ENDIF(LOCAL_COMPILE_FLAGS)
-ENDMACRO(SCL_ADDEXEC execname srcs libs)
+ENDMACRO(SCL_ADDEXEC execname srcslist libslist)
#SCL_ADDLIB( libname "source files" "linked libs" ["TESTABLE"] ["MSVC flag"
...])
# optional 4th argument of "TESTABLE", passed to EXCLUDE_OR_INSTALL macro
# optional args can also be used by MSVC-specific code, but it looks like
these two uses
# will not conflict because the MSVC args must contain "STRICT"
-MACRO(SCL_ADDLIB libname srcs libs)
- STRING(REGEX REPLACE " " ";" srcslist "${srcs}")
- STRING(REGEX REPLACE " " ";" libslist1 "${libs}")
+MACRO(SCL_ADDLIB libname srcslist libslist)
STRING(REGEX REPLACE "-framework;" "-framework " libslist "${libslist1}")
IF(SCL_BUILD_SHARED_LIBS)
add_library(${libname} SHARED ${srcslist})
@@ -134,4 +130,4 @@
SET_TARGET_PROPERTIES(${libname}-static PROPERTIES COMPILE_FLAGS
${LOCAL_COMPILE_FLAGS})
ENDIF(BUILD_STATIC_LIBS AND NOT MSVC)
ENDIF(LOCAL_COMPILE_FLAGS)
-ENDMACRO(SCL_ADDLIB libname srcs libs)
+ENDMACRO(SCL_ADDLIB libname srcslist libslist)
Modified: brlcad/trunk/src/other/step/data/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/step/data/CMakeLists.txt 2012-07-30 12:41:29 UTC
(rev 51715)
+++ brlcad/trunk/src/other/step/data/CMakeLists.txt 2012-07-30 12:46:46 UTC
(rev 51716)
@@ -85,7 +85,7 @@
set_tests_properties( generate_cpp_${SCHEMA_SHORT_NAME} PROPERTIES LABELS
cpp_schema_gen )
set_tests_properties( build_cpp_${PROJECT_NAME} PROPERTIES DEPENDS
generate_cpp_${SCHEMA_SHORT_NAME} LABELS cpp_schema_build )
- SCL_ADDEXEC( p21read_${PROJECT_NAME}
"${SCL_SOURCE_DIR}/src/test/p21read/p21read.cc" "${PROJECT_NAME} base" )
+ SCL_ADDEXEC( p21read_${PROJECT_NAME}
"${SCL_SOURCE_DIR}/src/test/p21read/p21read.cc" "${PROJECT_NAME};base" )
add_dependencies( p21read_${PROJECT_NAME} version_string )
set_target_properties( p21read_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
${${PROJECT_NAME}_COMPILE_FLAGS} )
Modified: brlcad/trunk/src/other/step/src/cldai/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/step/src/cldai/CMakeLists.txt 2012-07-30
12:41:29 UTC (rev 51715)
+++ brlcad/trunk/src/other/step/src/cldai/CMakeLists.txt 2012-07-30
12:46:46 UTC (rev 51716)
@@ -34,4 +34,4 @@
${SCL_SOURCE_DIR}/src/clutils
)
-SCL_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils base")
+SCL_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils;base")
Modified: brlcad/trunk/src/other/step/src/cleditor/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/step/src/cleditor/CMakeLists.txt 2012-07-30
12:41:29 UTC (rev 51715)
+++ brlcad/trunk/src/other/step/src/cleditor/CMakeLists.txt 2012-07-30
12:46:46 UTC (rev 51716)
@@ -41,4 +41,4 @@
${SCL_SOURCE_DIR}/src/clutils
)
-SCL_ADDLIB(stepeditor "${LIBSTEPEDITOR_SRCS}" "stepcore stepdai steputils
base")
+SCL_ADDLIB(stepeditor "${LIBSTEPEDITOR_SRCS}"
"stepcore;stepdai;steputils;base")
Modified: brlcad/trunk/src/other/step/src/clstepcore/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/step/src/clstepcore/CMakeLists.txt 2012-07-30
12:41:29 UTC (rev 51715)
+++ brlcad/trunk/src/other/step/src/clstepcore/CMakeLists.txt 2012-07-30
12:46:46 UTC (rev 51716)
@@ -53,4 +53,4 @@
${SCL_SOURCE_DIR}/src/clutils
)
-SCL_ADDLIB(stepcore "${LIBSTEPCORE_SRCS}" "express steputils stepdai base")
+SCL_ADDLIB(stepcore "${LIBSTEPCORE_SRCS}" "express;steputils;stepdai;base")
Modified: brlcad/trunk/src/other/step/src/exppp/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/step/src/exppp/CMakeLists.txt 2012-07-30
12:41:29 UTC (rev 51715)
+++ brlcad/trunk/src/other/step/src/exppp/CMakeLists.txt 2012-07-30
12:46:46 UTC (rev 51716)
@@ -17,7 +17,7 @@
add_definitions( -D__STDC__ )
endif()
-SCL_ADDLIB(libexppp "${LIBEXPPP_SOURCES}" "express base")
+SCL_ADDLIB(libexppp "${LIBEXPPP_SOURCES}" "express;base")
set_target_properties(libexppp PROPERTIES PREFIX "")
-SCL_ADDEXEC(exppp "${EXPPP_SOURCES}" "libexppp express base")
+SCL_ADDEXEC(exppp "${EXPPP_SOURCES}" "libexppp;express;base")
Modified: brlcad/trunk/src/other/step/src/express/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/step/src/express/CMakeLists.txt 2012-07-30
12:41:29 UTC (rev 51715)
+++ brlcad/trunk/src/other/step/src/express/CMakeLists.txt 2012-07-30
12:46:46 UTC (rev 51716)
@@ -115,7 +115,7 @@
SCL_ADDLIB(express "${EXPRESS_SOURCES}" "base")
add_dependencies(express express_verify)
add_dependencies(express version_string)
-SCL_ADDEXEC("check-express" "${CHECK_EXPRESS_SOURCES}" "express base" )
+SCL_ADDEXEC("check-express" "${CHECK_EXPRESS_SOURCES}" "express;base" )
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/src/other/step/src/fedex_plus/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/step/src/fedex_plus/CMakeLists.txt 2012-07-30
12:41:29 UTC (rev 51715)
+++ brlcad/trunk/src/other/step/src/fedex_plus/CMakeLists.txt 2012-07-30
12:46:46 UTC (rev 51716)
@@ -31,6 +31,6 @@
${SCL_SOURCE_DIR}/src/base
)
-SCL_ADDEXEC(fedex_plus "${fedex_plus_SOURCES}" "libexppp express base")
+SCL_ADDEXEC(fedex_plus "${fedex_plus_SOURCES}" "libexppp;express;base")
add_dependencies( fedex_plus version_string )
Modified: brlcad/trunk/src/other/step/src/fedex_python/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/step/src/fedex_python/CMakeLists.txt 2012-07-30
12:41:29 UTC (rev 51715)
+++ brlcad/trunk/src/other/step/src/fedex_python/CMakeLists.txt 2012-07-30
12:46:46 UTC (rev 51716)
@@ -31,7 +31,7 @@
../fedex_plus/write.cc
../fedex_plus/print.cc
)
-SCL_ADDEXEC(fedex_python "${fedex_python_SOURCES}" "libexppp express base")
+SCL_ADDEXEC(fedex_python "${fedex_python_SOURCES}" "libexppp;express;base")
add_dependencies( fedex_python version_string )
endif(SCL_PYTHON_GENERATOR)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
