Revision: 40952
http://brlcad.svn.sourceforge.net/brlcad/?rev=40952&view=rev
Author: starseeker
Date: 2010-10-08 18:01:01 +0000 (Fri, 08 Oct 2010)
Log Message:
-----------
Take a stab a conditionalizing the parts of the source that require either
lex/yacc or libraries built using lex/yacc.
Modified Paths:
--------------
brlcad/branches/cmake/src/conv/CMakeLists.txt
brlcad/branches/cmake/src/mged/CMakeLists.txt
brlcad/branches/cmake/src/other/CMakeLists.txt
Modified: brlcad/branches/cmake/src/conv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/CMakeLists.txt 2010-10-08 17:37:01 UTC
(rev 40951)
+++ brlcad/branches/cmake/src/conv/CMakeLists.txt 2010-10-08 18:01:01 UTC
(rev 40952)
@@ -1,4 +1,6 @@
-ADD_SUBDIRECTORY(step)
+IF(LEX_EXECUTABLE AND YACC_EXECUTABLE)
+ ADD_SUBDIRECTORY(step)
+ENDIF(LEX_EXECUTABLE AND YACC_EXECUTABLE)
ADD_SUBDIRECTORY(iges)
ADD_SUBDIRECTORY(intaval)
Modified: brlcad/branches/cmake/src/mged/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/mged/CMakeLists.txt 2010-10-08 17:37:01 UTC
(rev 40951)
+++ brlcad/branches/cmake/src/mged/CMakeLists.txt 2010-10-08 18:01:01 UTC
(rev 40952)
@@ -1,4 +1,7 @@
-ADD_SUBDIRECTORY(points)
+IF(LEX_EXECUTABLE AND YACC_EXECUTABLE)
+ ADD_SUBDIRECTORY(points)
+ SET(pointstarget libpoints)
+ENDIF(LEX_EXECUTABLE AND YACC_EXECUTABLE)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
@@ -100,7 +103,7 @@
vrlink.c
)
-BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "libpoints libtermio libwdb libged libdm
libtclcad")
+BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "${pointstarget} libtermio libwdb libged
libdm libtclcad")
BRLCAD_ADDEXEC(cad_boundp cad_boundp.c libbu)
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-08 17:37:01 UTC
(rev 40951)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-08 18:01:01 UTC
(rev 40952)
@@ -217,35 +217,38 @@
THIRD_PARTY_SUBDIR(OPENNURBS openNURBS)
# STEP Class Libraries
-THIRD_PARTY_OPTION(SCL scl)
-THIRD_PARTY_SUBDIR(SCL step)
-IF(BRLCAD_BUILD_LOCAL_SCL)
- SET(BRLCAD_SCL_INCLUDE_DIR
"${BRLCAD_SOURCE_DIR}/src/other/step/include" CACHE STRING "Directory
containing SCL headers" FORCE)
- SET(BRLCAD_SCL_EXPRESS_EXECUTABLE "express" CACHE STRING "SCL express
binary" FORCE)
- SET(BRLCAD_SCL_SYMLINK_EXECUTABLE "symlink" CACHE STRING "SCL symlink
binary" FORCE)
- SET(BRLCAD_SCL_EXPPP_EXECUTABLE "exppp" CACHE STRING "SCL exppp binary"
FORCE)
- SET(BRLCAD_SCL_FEDEX_OS_EXECUTABLE "fedex_os" CACHE STRING "SCL
fedex_os binary" FORCE)
- SET(BRLCAD_SCL_FEDEX_IDL_EXECUTABLE "fedex_idl" CACHE STRING "SCL
fedex_idl binary" FORCE)
- SET(BRLCAD_SCL_FEDEX_PLUS_EXECUTABLE "fedex_plus" CACHE STRING "SCL
fedex_plus binary" FORCE)
- SET(BRLCAD_SCL_EXPPP_LIB "libexppp" CACHE STRING "SCL exppp library"
FORCE)
- SET(BRLCAD_SCL_CORE_LIB "stepcore" CACHE STRING "SCL core library"
FORCE)
- SET(BRLCAD_SCL_UTILS_LIB "steputils" CACHE STRING "SCL utilities
library" FORCE)
- SET(BRLCAD_SCL_DAI_LIB "stepdai" CACHE STRING "SCL DAI library" FORCE)
- SET(BRLCAD_SCL_EDITOR_LIB "stepeditor" CACHE STRING "SCL editor
library" FORCE)
-ELSE(BRLCAD_BUILD_LOCAL_SCL)
- SET(BRLCAD_SCL_INCLUDE_DIR "${SCL_INCLUDE_DIR}" CACHE STRING "Directory
containing SCL headers" FORCE)
- SET(BRLCAD_SCL_EXPRESS_EXECUTABLE "${SCL_EXPRESS_EXECUTABLE}" CACHE
STRING "SCL express binary" FORCE)
- SET(BRLCAD_SCL_SYMLINK_EXECUTABLE "${SCL_SYMLINK_EXECUTABLE}" CACHE
STRING "SCL symlink binary" FORCE)
- SET(BRLCAD_SCL_EXPPP_EXECUTABLE "${SCL_EXPPP_EXECUTABLE}" CACHE STRING
"SCL exppp binary" FORCE)
- SET(BRLCAD_SCL_FEDEX_OS_EXECUTABLE "${SCL_FEDEX_OS_EXECUTABLE}" CACHE
STRING "SCL fedex_os binary" FORCE)
- SET(BRLCAD_SCL_FEDEX_IDL_EXECUTABLE "${SCL_FEDEX_IDL_EXECUTABLE}" CACHE
STRING "SCL fedex_idl binary" FORCE)
- SET(BRLCAD_SCL_FEDEX_PLUS_EXECUTABLE "${SCL_FEDEX_PLUS_EXECUTABLE}"
CACHE STRING "SCL fedex_plus binary" FORCE)
- SET(BRLCAD_SCL_EXPPP_LIB "${SCL_EXPPP_LIB}" CACHE STRING "SCL exppp
library" FORCE)
- SET(BRLCAD_SCL_CORE_LIB "${SCL_CORE_LIB}" CACHE STRING "SCL core
library" FORCE)
- SET(BRLCAD_SCL_UTILS_LIB "${SCL_UTILS_LIB}" CACHE STRING "SCL utilities
library" FORCE)
- SET(BRLCAD_SCL_DAI_LIB "${SCL_DAI_LIB}" CACHE STRING "SCL DAI library"
FORCE)
- SET(BRLCAD_SCL_EDITOR_LIB "${SCL_EDITOR_LIB}" CACHE STRING "SCL editor
library" FORCE)
-ENDIF(BRLCAD_BUILD_LOCAL_SCL)
+# If we don't have Lex/Yacc, we can't do STEP - conditionalize
+IF(LEX_EXECUTABLE AND YACC_EXECUTABLE)
+ THIRD_PARTY_OPTION(SCL scl)
+ THIRD_PARTY_SUBDIR(SCL step)
+ IF(BRLCAD_BUILD_LOCAL_SCL)
+ SET(BRLCAD_SCL_INCLUDE_DIR
"${BRLCAD_SOURCE_DIR}/src/other/step/include" CACHE STRING "Directory
containing SCL headers" FORCE)
+ SET(BRLCAD_SCL_EXPRESS_EXECUTABLE "express" CACHE STRING "SCL
express binary" FORCE)
+ SET(BRLCAD_SCL_SYMLINK_EXECUTABLE "symlink" CACHE STRING "SCL
symlink binary" FORCE)
+ SET(BRLCAD_SCL_EXPPP_EXECUTABLE "exppp" CACHE STRING "SCL exppp
binary" FORCE)
+ SET(BRLCAD_SCL_FEDEX_OS_EXECUTABLE "fedex_os" CACHE STRING "SCL
fedex_os binary" FORCE)
+ SET(BRLCAD_SCL_FEDEX_IDL_EXECUTABLE "fedex_idl" CACHE STRING
"SCL fedex_idl binary" FORCE)
+ SET(BRLCAD_SCL_FEDEX_PLUS_EXECUTABLE "fedex_plus" CACHE STRING
"SCL fedex_plus binary" FORCE)
+ SET(BRLCAD_SCL_EXPPP_LIB "libexppp" CACHE STRING "SCL exppp
library" FORCE)
+ SET(BRLCAD_SCL_CORE_LIB "stepcore" CACHE STRING "SCL core
library" FORCE)
+ SET(BRLCAD_SCL_UTILS_LIB "steputils" CACHE STRING "SCL
utilities library" FORCE)
+ SET(BRLCAD_SCL_DAI_LIB "stepdai" CACHE STRING "SCL DAI library"
FORCE)
+ SET(BRLCAD_SCL_EDITOR_LIB "stepeditor" CACHE STRING "SCL editor
library" FORCE)
+ ELSE(BRLCAD_BUILD_LOCAL_SCL)
+ SET(BRLCAD_SCL_INCLUDE_DIR "${SCL_INCLUDE_DIR}" CACHE STRING
"Directory containing SCL headers" FORCE)
+ SET(BRLCAD_SCL_EXPRESS_EXECUTABLE "${SCL_EXPRESS_EXECUTABLE}"
CACHE STRING "SCL express binary" FORCE)
+ SET(BRLCAD_SCL_SYMLINK_EXECUTABLE "${SCL_SYMLINK_EXECUTABLE}"
CACHE STRING "SCL symlink binary" FORCE)
+ SET(BRLCAD_SCL_EXPPP_EXECUTABLE "${SCL_EXPPP_EXECUTABLE}" CACHE
STRING "SCL exppp binary" FORCE)
+ SET(BRLCAD_SCL_FEDEX_OS_EXECUTABLE "${SCL_FEDEX_OS_EXECUTABLE}"
CACHE STRING "SCL fedex_os binary" FORCE)
+ SET(BRLCAD_SCL_FEDEX_IDL_EXECUTABLE
"${SCL_FEDEX_IDL_EXECUTABLE}" CACHE STRING "SCL fedex_idl binary" FORCE)
+ SET(BRLCAD_SCL_FEDEX_PLUS_EXECUTABLE
"${SCL_FEDEX_PLUS_EXECUTABLE}" CACHE STRING "SCL fedex_plus binary" FORCE)
+ SET(BRLCAD_SCL_EXPPP_LIB "${SCL_EXPPP_LIB}" CACHE STRING "SCL
exppp library" FORCE)
+ SET(BRLCAD_SCL_CORE_LIB "${SCL_CORE_LIB}" CACHE STRING "SCL
core library" FORCE)
+ SET(BRLCAD_SCL_UTILS_LIB "${SCL_UTILS_LIB}" CACHE STRING "SCL
utilities library" FORCE)
+ SET(BRLCAD_SCL_DAI_LIB "${SCL_DAI_LIB}" CACHE STRING "SCL DAI
library" FORCE)
+ SET(BRLCAD_SCL_EDITOR_LIB "${SCL_EDITOR_LIB}" CACHE STRING "SCL
editor library" FORCE)
+ ENDIF(BRLCAD_BUILD_LOCAL_SCL)
+ENDIF(LEX_EXECUTABLE AND YACC_EXECUTABLE)
# The jama/tnt headers are installed by default - BRL-CAD requires the altered
headers
# to build (I think?)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
