Thread: [brlcad-commits] SF.net SVN: brlcad:[44478] brlcad/trunk/src/other/CMakeLists.txt
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
brlcad-commits
|
From: <sta...@us...> - 2011-04-21 18:58:59
|
Revision: 44478
http://brlcad.svn.sourceforge.net/brlcad/?rev=44478&view=rev
Author: starseeker
Date: 2011-04-21 18:58:53 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
Add a few dirs to the ignore list
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-04-21 17:42:34 UTC (rev 44477)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-04-21 18:58:53 UTC (rev 44478)
@@ -233,6 +233,7 @@
rle_row_free.3
rle_skiprow.3
scanargs.3
+ CMake
)
DISTCHECK_IGNORE(libutahrle utahrle_ignore_files)
@@ -773,6 +774,7 @@
src/tkhtml.tcl
src/tokenlist.txt
tclconfig
+ CMake
)
DISTCHECK_IGNORE(tkhtml tkhtml_ignore_files)
@@ -791,6 +793,7 @@
README
license.terms
pkgIndex.tcl.in
+ CMake
)
DISTCHECK_IGNORE(tkpng tkpng_ignore_files)
@@ -827,6 +830,7 @@
tests
unix
win
+ CMake
)
DISTCHECK_IGNORE(tktable tktable_ignore_files)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eri...@us...> - 2011-05-05 20:35:22
|
Revision: 44571
http://brlcad.svn.sourceforge.net/brlcad/?rev=44571&view=rev
Author: erikgreenwald
Date: 2011-05-05 20:35:16 +0000 (Thu, 05 May 2011)
Log Message:
-----------
allow togl on non-X11 platforms. Mark TOGL_LIBRARIES and TOGL_INCLUDE_DIRS as advanced.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-05-05 20:34:23 UTC (rev 44570)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-05-05 20:35:16 UTC (rev 44571)
@@ -1004,10 +1004,12 @@
# For now only turn on Togl for X11, but will need it everywhere eventually. Will need
# some logic to both look for package require and the C library, as both APIs will be needed.
-IF(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
+IF(BRLCAD-ENABLE_OPENGL)
SET(TOGL_LIBRARIES togl CACHE STRING "TOGL_LIBRARIES" FORCE)
SET(TOGL_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/togl/include;${CMAKE_CURRENT_SOURCE_DIR}/togl/include" CACHE STRING "Togl include path" FORCE)
- ADD_SUBDIRECTORY(togl)
+ MARK_AS_ADVANCED(TOGL_LIBRARIES)
+ MARK_AS_ADVANCED(TOGL_INCLUDE_DIRS)
+ ADD_SUBDIRECTORY(togl)
SET(togl_ignore_files
CMake
LICENSE
@@ -1017,7 +1019,7 @@
doc
include
tools
- )
+ )
DISTCHECK_IGNORE(togl togl_ignore_files)
SET(togl_src_ignore_files
Togl.py
@@ -1029,7 +1031,7 @@
toglGLX.c
toglNSOpenGL.c
toglWGL.c
- )
+ )
DISTCHECK_IGNORE(togl/src togl_src_ignore_files)
SET(togl_demo_ignore_files
ben.rgb
@@ -1049,11 +1051,11 @@
texture.c
texture.tcl
tree2.rgba
- )
+ )
DISTCHECK_IGNORE(togl/demo togl_demo_ignore_files)
-ELSE(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
+ELSE(BRLCAD-ENABLE_OPENGL)
DISTCHECK_IGNORE_ITEM(togl)
-ENDIF(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
+ENDIF(BRLCAD-ENABLE_OPENGL)
# jove editor - technically this isn't a library,
# but traditionally it's grouped into the "enable-all"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-06-16 18:57:49
|
Revision: 45074
http://brlcad.svn.sourceforge.net/brlcad/?rev=45074&view=rev
Author: starseeker
Date: 2011-06-16 18:57:43 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
Get another stray variable marked as advanced.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-06-16 18:56:13 UTC (rev 45073)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-06-16 18:57:43 UTC (rev 45074)
@@ -77,7 +77,8 @@
IF(NOT WIN32)
SET(HAVE_TERMLIB 1 CACHE BOOL "Have some termlib" FORCE)
ELSE(NOT WIN32)
- SET(BRLCAD_BUILD_LOCAL_TERMLIB_FORCE_OFF ON CACHE BOOL "Disable libtermlib build." FORCE)
+ SET(BRLCAD_BUILD_LOCAL_TERMLIB_FORCE_OFF ON CACHE BOOL "Disable libtermlib build." FORCE)
+ MARK_AS_ADVANCED(BRLCAD_BUILD_LOCAL_TERMLIB_FORCE_OFF)
SET(HAVE_TERMLIB 0 CACHE BOOL "Have some termlib" FORCE)
ENDIF(NOT WIN32)
MARK_AS_ADVANCED(HAVE_TERMLIB)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-06-21 12:30:40
|
Revision: 45176
http://brlcad.svn.sourceforge.net/brlcad/?rev=45176&view=rev
Author: starseeker
Date: 2011-06-21 12:30:29 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
Reorder things a bit.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-06-21 12:25:20 UTC (rev 45175)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-06-21 12:30:29 UTC (rev 45176)
@@ -12,7 +12,34 @@
add_definitions(-w)
ENDIF(BRLCAD-DISABLE_SRC_OTHER_WARN)
+# Most third party items have a list calling out files for distcheck - these
+# are stored in files in the dlists directory. Ignore that directory for
+# distcheck
+FILE(GLOB dlists "*.dist")
+FOREACH(ITEM ${dlists})
+ get_filename_component(dlist ${ITEM} NAME)
+ DISTCHECK_IGNORE_ITEM(${dlist})
+ENDFOREACH(ITEM ${dlists})
+
#---------------------------------------------------------------------------------
+# Optionally Building Local Copies of External Libraries
+#
+# Need to get a bit fancy here - since we want to be able to turn local libs
+# on/off at will, need to be careful about how we handle key variables. Approach
+# is to stash values in BRLCAD_* prefixed versions, then restore them after
+# the various Find*.cmake commands do their thing. If NOT doing local build,
+# then the BRLCAD_* and standard variables will be the same. It remains to be
+# seen if there will be enough consistency for a macro - the variables that
+# need to be overridden will vary depending on the particular tests made by each
+# subdirectory's CMake logic.
+#---------------------------------------------------------------------------------
+
+# libregex library - needed by tools, so do this one first.
+THIRD_PARTY_OPTION(REGEX regex)
+THIRD_PARTY_SUBDIR(REGEX libregex)
+BRLCAD_INCLUDE_FILE(regex.h HAVE_REGEX_H)
+
+#---------------------------------------------------------------------------------
# Local Copies of Tools
#---------------------------------------------------------------------------------
OPTION(BUILD_LOCAL_TOOLS "Build local copies of m4, byacc and flex" OFF)
@@ -42,28 +69,6 @@
ADD_SUBDIRECTORY(flex)
ENDIF(BUILD_LOCAL_TOOLS)
-#---------------------------------------------------------------------------------
-# Optionally Building Local Copies of External Libraries
-#
-# Need to get a bit fancy here - since we want to be able to turn local libs
-# on/off at will, need to be careful about how we handle key variables. Approach
-# is to stash values in BRLCAD_* prefixed versions, then restore them after
-# the various Find*.cmake commands do their thing. If NOT doing local build,
-# then the BRLCAD_* and standard variables will be the same. It remains to be
-# seen if there will be enough consistency for a macro - the variables that
-# need to be overridden will vary depending on the particular tests made by each
-# subdirectory's CMake logic.
-#---------------------------------------------------------------------------------
-
-# Most third party items have a list calling out files for distcheck - these
-# are stored in files in the dlists directory. Ignore that directory for
-# distcheck
-FILE(GLOB dlists "*.dist")
-FOREACH(ITEM ${dlists})
- get_filename_component(dlist ${ITEM} NAME)
- DISTCHECK_IGNORE_ITEM(${dlist})
-ENDFOREACH(ITEM ${dlists})
-
# Ignore the boost subdir - it's only used for the boost headers and is not
# compiled
DISTCHECK_IGNORE_ITEM(boost)
@@ -134,12 +139,6 @@
MARK_AS_ADVANCED(uname_executable)
-# libregex Library
-THIRD_PARTY_OPTION(REGEX regex)
-THIRD_PARTY_SUBDIR(REGEX libregex)
-BRLCAD_INCLUDE_FILE(regex.h HAVE_REGEX_H)
-
-
# libutahrle Library - The directory to perform ADD_SUBDIRECTORY on and the
# include directory for utahrle are different, so override the macro's setting
# of UTAHRLE_INCLUDE_DIR here.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-06-27 18:03:05
|
Revision: 45244
http://brlcad.svn.sourceforge.net/brlcad/?rev=45244&view=rev
Author: starseeker
Date: 2011-06-27 18:02:58 +0000 (Mon, 27 Jun 2011)
Log Message:
-----------
Mark this option as adavnced - eventually it will go away altogether, once we get it straightened out what tool chain we'll be using and add ThirdParty/Find* tests for what we need.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-06-27 17:51:37 UTC (rev 45243)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-06-27 18:02:58 UTC (rev 45244)
@@ -43,6 +43,7 @@
# Local Copies of Tools
#---------------------------------------------------------------------------------
OPTION(BUILD_LOCAL_TOOLS "Build local copies of m4, byacc and flex" OFF)
+MARK_AS_ADVANCED(BUILD_LOCAL_TOOLS)
IF(BUILD_LOCAL_TOOLS)
# Build Berkeley Yacc - guarantees certain extensions added originally by GNU
# Bison are supported, as well as yacc itself (problematic on, say, Windows.)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-08-10 20:13:24
|
Revision: 45906
http://brlcad.svn.sourceforge.net/brlcad/?rev=45906&view=rev
Author: starseeker
Date: 2011-08-10 20:13:17 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
Ah - when doing the local termlib, we have to specify that we are using the termcap.h header as well. Probably didn't spot this sooner because most systems had a system termcap.h and the BRLCAD_INCLUDE_FILE test just happened to work as well.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-08-10 20:10:02 UTC (rev 45905)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-08-10 20:13:17 UTC (rev 45906)
@@ -102,7 +102,10 @@
IF(HAVE_TERMLIB)
THIRD_PARTY_OPTION(TERMLIB termlib)
- THIRD_PARTY_SUBDIR(TERMLIB libtermlib)
+ THIRD_PARTY_SUBDIR(TERMLIB libtermlib)
+ IF(BRLCAD_BUILD_LOCAL_TERMLIB)
+ SET(HAVE_TERMCAP_H 1 CACHE BOOL "src/other termlib is on" FORCE)
+ ENDIF(BRLCAD_BUILD_LOCAL_TERMLIB)
ELSE(HAVE_TERMLIB)
DISTCHECK_IGNORE_ITEM(libtermlib)
ENDIF(HAVE_TERMLIB)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-08-13 03:50:15
|
Revision: 45962
http://brlcad.svn.sourceforge.net/brlcad/?rev=45962&view=rev
Author: starseeker
Date: 2011-08-13 03:50:08 +0000 (Sat, 13 Aug 2011)
Log Message:
-----------
Need to flag ITCL_LIBRARY as advanced here too.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-08-13 02:37:09 UTC (rev 45961)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-08-13 03:50:08 UTC (rev 45962)
@@ -326,6 +326,7 @@
SET(ITCL_VERSION "${ITCL_PACKAGE_VERSION}" CACHE STRING "ITCL_VERSION" FORCE)
find_library(ITCL_LIBRARY itcl)
get_filename_component(ITCL_BIN_PREFIX ${ITCL_LIBRARY} PATH)
+ MARK_AS_ADVANCED(ITCL_LIBRARY)
ENDIF(BRLCAD_ITCL_BUILD)
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ITCL_VERSION \"${ITCL_VERSION}\"\n")
MARK_AS_ADVANCED(ITCL_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-08-15 02:01:18
|
Revision: 45980
http://brlcad.svn.sourceforge.net/brlcad/?rev=45980&view=rev
Author: starseeker
Date: 2011-08-15 02:01:11 +0000 (Mon, 15 Aug 2011)
Log Message:
-----------
Oops - variables changed, so update conditionals that use them...
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-08-15 01:25:24 UTC (rev 45979)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-08-15 02:01:11 UTC (rev 45980)
@@ -90,19 +90,18 @@
#Only on WIN32 will the combination of the build search tests and
#libtermlib fail to find a valid term, so set variables accordingly
IF(NOT WIN32)
- SET(HAVE_TERMLIB 1 CACHE BOOL "Have some termlib" FORCE)
+ SET(HAVE_TERMLIB 1 CACHE BOOL "Have some termlib" FORCE)
ELSE(NOT WIN32)
- SET(BRLCAD_BUILD_LOCAL_TERMLIB_FORCE_OFF ON CACHE BOOL "Disable libtermlib build." FORCE)
- MARK_AS_ADVANCED(BRLCAD_BUILD_LOCAL_TERMLIB_FORCE_OFF)
- SET(HAVE_TERMLIB 0 CACHE BOOL "Have some termlib" FORCE)
+ SET(BRLCAD_TERMLIB_BUILD "System" CACHE STRING "Disable libtermlib build on WIN32." FORCE)
+ SET(HAVE_TERMLIB 0 CACHE BOOL "Have some termlib" FORCE)
ENDIF(NOT WIN32)
MARK_AS_ADVANCED(HAVE_TERMLIB)
IF(HAVE_TERMLIB)
THIRD_PARTY(termlib libtermlib)
- IF(BRLCAD_BUILD_LOCAL_TERMLIB)
+ IF(BRLCAD_TERMLIB_BUILD)
SET(HAVE_TERMCAP_H 1 CACHE BOOL "src/other termlib is on" FORCE)
- ENDIF(BRLCAD_BUILD_LOCAL_TERMLIB)
+ ENDIF(BRLCAD_TERMLIB_BUILD)
ELSE(HAVE_TERMLIB)
DISTCHECK_IGNORE_ITEM(libtermlib)
ENDIF(HAVE_TERMLIB)
@@ -325,6 +324,7 @@
ELSE(BRLCAD_ITCL_BUILD)
SET(ITCL_VERSION "${ITCL_PACKAGE_VERSION}" CACHE STRING "ITCL_VERSION" FORCE)
find_library(ITCL_LIBRARY itcl)
+ SET(ITCL_LIBRARY ${ITCL_LIBRARY} CACHE STRING "ITCL_LIBRARY" FORCE)
get_filename_component(ITCL_BIN_PREFIX ${ITCL_LIBRARY} PATH)
MARK_AS_ADVANCED(ITCL_LIBRARY)
ENDIF(BRLCAD_ITCL_BUILD)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-08-15 02:09:33
|
Revision: 45981
http://brlcad.svn.sourceforge.net/brlcad/?rev=45981&view=rev
Author: starseeker
Date: 2011-08-15 02:09:27 +0000 (Mon, 15 Aug 2011)
Log Message:
-----------
Be slightly more aggressive with the find_library command for itcl
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-08-15 02:01:11 UTC (rev 45980)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-08-15 02:09:27 UTC (rev 45981)
@@ -323,7 +323,7 @@
SET(ITCL_BIN_PREFIX ${CMAKE_BINARY_DIR}/${LIB_DIR})
ELSE(BRLCAD_ITCL_BUILD)
SET(ITCL_VERSION "${ITCL_PACKAGE_VERSION}" CACHE STRING "ITCL_VERSION" FORCE)
- find_library(ITCL_LIBRARY itcl)
+ find_library(ITCL_LIBRARY NAMES itcl itcl${ITCL_PACKAGE_VERSION} PATH_SUFFIXES itcl${ITCL_PACKAGE_VERSION})
SET(ITCL_LIBRARY ${ITCL_LIBRARY} CACHE STRING "ITCL_LIBRARY" FORCE)
get_filename_component(ITCL_BIN_PREFIX ${ITCL_LIBRARY} PATH)
MARK_AS_ADVANCED(ITCL_LIBRARY)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-08-15 15:40:53
|
Revision: 45984
http://brlcad.svn.sourceforge.net/brlcad/?rev=45984&view=rev
Author: starseeker
Date: 2011-08-15 15:40:47 +0000 (Mon, 15 Aug 2011)
Log Message:
-----------
if 3rd party settings need termcap.h var in the cache, mark it as advanced.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-08-15 03:10:31 UTC (rev 45983)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-08-15 15:40:47 UTC (rev 45984)
@@ -101,6 +101,7 @@
THIRD_PARTY(termlib libtermlib)
IF(BRLCAD_TERMLIB_BUILD)
SET(HAVE_TERMCAP_H 1 CACHE BOOL "src/other termlib is on" FORCE)
+ MARK_AS_ADVANCED(HAVE_TERMCAP_H)
ENDIF(BRLCAD_TERMLIB_BUILD)
ELSE(HAVE_TERMLIB)
DISTCHECK_IGNORE_ITEM(libtermlib)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-08-29 14:48:48
|
Revision: 46447
http://brlcad.svn.sourceforge.net/brlcad/?rev=46447&view=rev
Author: starseeker
Date: 2011-08-29 14:48:41 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
mark BRLCAD_TERMLIB_BUILD as advanced
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-08-29 14:16:18 UTC (rev 46446)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-08-29 14:48:41 UTC (rev 46447)
@@ -70,6 +70,7 @@
SET(HAVE_TERMLIB 1 CACHE BOOL "Have some termlib" FORCE)
ELSE(NOT WIN32)
SET(BRLCAD_TERMLIB_BUILD "System" CACHE STRING "Disable libtermlib build on WIN32." FORCE)
+ MARK_AS_ADVANCED(BRLCAD_TERMLIB_BUILD)
SET(HAVE_TERMLIB 0 CACHE BOOL "Have some termlib" FORCE)
ENDIF(NOT WIN32)
MARK_AS_ADVANCED(HAVE_TERMLIB)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-08-29 17:24:17
|
Revision: 46451
http://brlcad.svn.sourceforge.net/brlcad/?rev=46451&view=rev
Author: starseeker
Date: 2011-08-29 17:24:10 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
when doing win, also need xlib
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-08-29 15:08:14 UTC (rev 46450)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-08-29 17:24:10 UTC (rev 46451)
@@ -266,7 +266,7 @@
SET(ITCL_SRC_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/incrTcl/itcl)
IF(WIN32)
SET(TCL_INCLUDE_DIRS ${TCL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/tcl/generic ${CMAKE_CURRENT_SOURCE_DIR}/tcl/win ${CMAKE_CURRENT_SOURCE_DIR}/tcl/libtommath)
- SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/tk/generic ${CMAKE_CURRENT_SOURCE_DIR}/tk/win ${CMAKE_CURRENT_SOURCE_DIR}/tk/bitmaps)
+ SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/tk/generic ${CMAKE_CURRENT_SOURCE_DIR}/tk/xlib ${CMAKE_CURRENT_SOURCE_DIR}/tk/win ${CMAKE_CURRENT_SOURCE_DIR}/tk/bitmaps)
ELSE(WIN32)
SET(TCL_INCLUDE_DIRS ${TCL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/tcl/generic ${CMAKE_CURRENT_SOURCE_DIR}/tcl/unix ${CMAKE_CURRENT_SOURCE_DIR}/tcl/libtommath)
SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/tk/generic ${CMAKE_CURRENT_SOURCE_DIR}/tk/bitmaps)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-10-06 14:14:33
|
Revision: 47154
http://brlcad.svn.sourceforge.net/brlcad/?rev=47154&view=rev
Author: starseeker
Date: 2011-10-06 14:14:22 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
Make a stab at turning Itcl/Itk back on if we can't find the libraries.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-10-06 14:04:35 UTC (rev 47153)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-10-06 14:14:22 UTC (rev 47154)
@@ -319,10 +319,24 @@
SET(ITCL_VERSION "3.4" CACHE STRING "ITCL_VERSION" FORCE)
SET(ITCL_BIN_PREFIX ${CMAKE_BINARY_DIR}/${LIB_DIR})
ELSE(BRLCAD_ITCL_BUILD)
- SET(ITCL_VERSION "${ITCL_PACKAGE_VERSION}" CACHE STRING "ITCL_VERSION" FORCE)
find_library(ITCL_LIBRARY NAMES itcl itcl${ITCL_PACKAGE_VERSION} PATH_SUFFIXES itcl${ITCL_PACKAGE_VERSION})
- SET(ITCL_LIBRARY ${ITCL_LIBRARY} CACHE STRING "ITCL_LIBRARY" FORCE)
- get_filename_component(ITCL_BIN_PREFIX ${ITCL_LIBRARY} PATH)
+ IF(NOT ITCL_LIBRARY)
+ SET(${CMAKE_PROJECT_NAME}_ITCL "BUNDLED" CACHE STRING "Couldn't find ITCL_LIBRARY, even though Itcl package is present. Build bundled itcl library." FORCE)
+ THIRD_PARTY_TCL_PACKAGE(Itcl incrTcl/itcl "${TCL_TCLSH_EXECUTABLE}" "tcl")
+ SET(ITCL_LIBRARY itcl CACHE STRING "ITCL_LIBRARY" FORCE)
+ MARK_AS_ADVANCED(ITCL_LIBRARY)
+ SET(ITCL_STUB_LIBRARY itclstub CACHE STRING "ITCL_STUB_LIBRARY" FORCE)
+ MARK_AS_ADVANCED(ITCL_STUB_LIBRARY)
+ get_directory_property(ITCL_INCLUDE_DIRS DIRECTORY incrTcl/itcl DEFINITION ITCL_INCLUDE_DIRS)
+ SET(ITCL_INCLUDE_DIRS "${ITCL_INCLUDE_DIRS}" CACHE STRING "Itcl include paths" FORCE)
+ MARK_AS_ADVANCED(ITCL_INCLUDE_DIRS)
+ SET(ITCL_VERSION "3.4" CACHE STRING "ITCL_VERSION" FORCE)
+ SET(ITCL_BIN_PREFIX ${CMAKE_BINARY_DIR}/${LIB_DIR})
+ ELSE(NOT ITCL_LIBRARY)
+ SET(ITCL_VERSION "${ITCL_PACKAGE_VERSION}" CACHE STRING "ITCL_VERSION" FORCE)
+ SET(ITCL_LIBRARY ${ITCL_LIBRARY} CACHE STRING "ITCL_LIBRARY" FORCE)
+ get_filename_component(ITCL_BIN_PREFIX ${ITCL_LIBRARY} PATH)
+ ENDIF(NOT ITCL_LIBRARY)
MARK_AS_ADVANCED(ITCL_LIBRARY)
ENDIF(BRLCAD_ITCL_BUILD)
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ITCL_VERSION \"${ITCL_VERSION}\"\n")
@@ -335,12 +349,19 @@
MARK_AS_ADVANCED(ITK_LIBRARY)
SET(ITK_VERSION "3.3" CACHE STRING "ITK_VERSION" FORCE)
ELSE(BRLCAD_ITK_BUILD)
- SET(ITK_VERSION "${ITCL_VERSION}" CACHE STRING "ITK_VERSION" FORCE)
find_library(ITK_LIBRARY NAMES itk itk${ITCL_PACKAGE_VERSION} PATH_SUFFIXES itk${ITCL_PACKAGE_VERSION})
- SET(ITK_LIBRARY ${ITK_LIBRARY} CACHE STRING "ITK_LIBRARY" FORCE)
- get_filename_component(ITK_BIN_PREFIX ${ITK_LIBRARY} PATH)
- MARK_AS_ADVANCED(ITCL_LIBRARY)
-
+ IF(NOT ITK_LIBRARY OR NOT ITCL_LIBRARY)
+ SET(${CMAKE_PROJECT_NAME}_ITK "BUNDLED" CACHE STRING "Couldn't find incrTcl libraries, even though packages are present. Build bundled itk library." FORCE)
+ THIRD_PARTY_TCL_PACKAGE(Itk incrTcl/itk "${TCL_WISH_EXECUTABLE}" "tcl;itcl;tk")
+ SET(ITK_LIBRARY itk CACHE STRING "ITK_LIBRARY" FORCE)
+ MARK_AS_ADVANCED(ITK_LIBRARY)
+ SET(ITK_VERSION "3.3" CACHE STRING "ITK_VERSION" FORCE)
+ ELSE(NOT ITK_LIBRARY OR NOT ITCL_LIBRARY)
+ SET(ITK_VERSION "${ITCL_VERSION}" CACHE STRING "ITK_VERSION" FORCE)
+ SET(ITK_LIBRARY ${ITK_LIBRARY} CACHE STRING "ITK_LIBRARY" FORCE)
+ get_filename_component(ITK_BIN_PREFIX ${ITK_LIBRARY} PATH)
+ ENDIF(NOT ITK_LIBRARY OR NOT ITCL_LIBRARY)
+ MARK_AS_ADVANCED(ITK_LIBRARY)
ENDIF(BRLCAD_ITK_BUILD)
MARK_AS_ADVANCED(ITK_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-11-02 20:22:38
|
Revision: 47400
http://brlcad.svn.sourceforge.net/brlcad/?rev=47400&view=rev
Author: starseeker
Date: 2011-11-02 20:22:32 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
If we turn off opengl, turn off togl too
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-11-02 20:22:23 UTC (rev 47399)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-11-02 20:22:32 UTC (rev 47400)
@@ -436,11 +436,15 @@
SET(TOGL_STUB_LIBRARIES toglstub CACHE STRING "TOGL_STUB_LIBRARIES" FORCE)
SET(TOGL_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/togl/include;${CMAKE_CURRENT_SOURCE_DIR}/togl/include" CACHE STRING "Togl include path" FORCE)
MARK_AS_ADVANCED(TOGL_LIBRARIES)
+ MARK_AS_ADVANCED(TOGL_STUB_LIBRARIES)
MARK_AS_ADVANCED(TOGL_INCLUDE_DIRS)
ADD_SUBDIRECTORY(togl)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/togl.dist)
DISTCHECK_IGNORE(togl togl_ignore_files)
ELSE(BRLCAD-ENABLE_OPENGL)
+ SET(TOGL_LIBRARIES "" CACHE STRING "OpenGL disabled" FORCE)
+ SET(TOGL_STUB_LIBRARIES "" CACHE STRING "OpenGL disabled" FORCE)
+ SET(TOGL_INCLUDE_DIRS "" CACHE STRING "OpenGL disabled" FORCE)
DISTCHECK_IGNORE_ITEM(togl)
ENDIF(BRLCAD-ENABLE_OPENGL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-11-10 20:50:54
|
Revision: 47472
http://brlcad.svn.sourceforge.net/brlcad/?rev=47472&view=rev
Author: starseeker
Date: 2011-11-10 20:50:47 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
handle lemon before re2c, since re2c is using lemon now
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-11-10 17:58:54 UTC (rev 47471)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-11-10 20:50:47 UTC (rev 47472)
@@ -56,8 +56,8 @@
#---------------------------------------------------------------------------------
# Local Copies of Tools
#---------------------------------------------------------------------------------
+THIRD_PARTY_EXECUTABLE(lemon lemon)
THIRD_PARTY_EXECUTABLE(re2c re2c)
-THIRD_PARTY_EXECUTABLE(lemon lemon)
#---------------------------------------------------------------------------------
# Third Party Sources
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-11-28 18:34:55
|
Revision: 47662
http://brlcad.svn.sourceforge.net/brlcad/?rev=47662&view=rev
Author: starseeker
Date: 2011-11-28 18:34:48 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Mark as advanced
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-11-28 18:33:26 UTC (rev 47661)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-11-28 18:34:48 UTC (rev 47662)
@@ -457,9 +457,6 @@
SET(TOGL_LIBRARIES togl CACHE STRING "TOGL_LIBRARIES" FORCE)
SET(TOGL_STUB_LIBRARIES toglstub CACHE STRING "TOGL_STUB_LIBRARIES" FORCE)
SET(TOGL_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/togl/include;${CMAKE_CURRENT_SOURCE_DIR}/togl/include" CACHE STRING "Togl include path" FORCE)
- MARK_AS_ADVANCED(TOGL_LIBRARIES)
- MARK_AS_ADVANCED(TOGL_STUB_LIBRARIES)
- MARK_AS_ADVANCED(TOGL_INCLUDE_DIRS)
ADD_SUBDIRECTORY(togl)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/togl.dist)
DISTCHECK_IGNORE(togl togl_ignore_files)
@@ -469,6 +466,9 @@
SET(TOGL_INCLUDE_DIRS "" CACHE STRING "Tcl/Tk OpenGL disabled" FORCE)
DISTCHECK_IGNORE_ITEM(togl)
ENDIF(BRLCAD_ENABLE_OPENGL AND BRLCAD_ENABLE_X11)
+MARK_AS_ADVANCED(TOGL_LIBRARIES)
+MARK_AS_ADVANCED(TOGL_STUB_LIBRARIES)
+MARK_AS_ADVANCED(TOGL_INCLUDE_DIRS)
# jove editor - technically this isn't a library,
# but traditionally it's grouped into the "enable-all"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-11-30 18:58:45
|
Revision: 47710
http://brlcad.svn.sourceforge.net/brlcad/?rev=47710&view=rev
Author: starseeker
Date: 2011-11-30 18:58:34 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
If we're not able to build SCL, set the build var to off so it gets reported that way...
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-11-30 16:36:06 UTC (rev 47709)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-11-30 18:58:34 UTC (rev 47710)
@@ -432,6 +432,7 @@
MARK_AS_ADVANCED(FEDEX_PLUS_EXEC)
ELSE(LEX_EXECUTABLE AND YACC_EXECUTABLE)
DISTCHECK_IGNORE_ITEM(step)
+ SET(BRLCAD_BUILD_SCL OFF CACHE BOOL "Lex+Yacc not available, disabling Step Class Libraries" FORCE)
ENDIF(LEX_EXECUTABLE AND YACC_EXECUTABLE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-11-30 19:11:30
|
Revision: 47711
http://brlcad.svn.sourceforge.net/brlcad/?rev=47711&view=rev
Author: starseeker
Date: 2011-11-30 19:11:24 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Mark BUILD_SCL as advanced
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-11-30 18:58:34 UTC (rev 47710)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-11-30 19:11:24 UTC (rev 47711)
@@ -432,7 +432,8 @@
MARK_AS_ADVANCED(FEDEX_PLUS_EXEC)
ELSE(LEX_EXECUTABLE AND YACC_EXECUTABLE)
DISTCHECK_IGNORE_ITEM(step)
- SET(BRLCAD_BUILD_SCL OFF CACHE BOOL "Lex+Yacc not available, disabling Step Class Libraries" FORCE)
+ SET(BRLCAD_BUILD_SCL OFF CACHE STRING "Lex+Yacc not available, disabling Step Class Libraries" FORCE)
+ MARK_AS_ADVANCED(BRLCAD_BUILD_SCL)
ENDIF(LEX_EXECUTABLE AND YACC_EXECUTABLE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-11-30 19:31:32
|
Revision: 47712
http://brlcad.svn.sourceforge.net/brlcad/?rev=47712&view=rev
Author: starseeker
Date: 2011-11-30 19:31:20 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Ah, right - was setting the wrong thing for the toplevel mechanism. This is tested and works on Win32
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-11-30 19:11:24 UTC (rev 47711)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-11-30 19:31:20 UTC (rev 47712)
@@ -432,8 +432,7 @@
MARK_AS_ADVANCED(FEDEX_PLUS_EXEC)
ELSE(LEX_EXECUTABLE AND YACC_EXECUTABLE)
DISTCHECK_IGNORE_ITEM(step)
- SET(BRLCAD_BUILD_SCL OFF CACHE STRING "Lex+Yacc not available, disabling Step Class Libraries" FORCE)
- MARK_AS_ADVANCED(BRLCAD_BUILD_SCL)
+ SET(BRLCAD_SCL_BUILD OFF )
ENDIF(LEX_EXECUTABLE AND YACC_EXECUTABLE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-12-14 17:47:19
|
Revision: 47941
http://brlcad.svn.sourceforge.net/brlcad/?rev=47941&view=rev
Author: starseeker
Date: 2011-12-14 17:47:09 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
CMake can be run multiple times...
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-12-14 17:39:29 UTC (rev 47940)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-12-14 17:47:09 UTC (rev 47941)
@@ -43,6 +43,10 @@
DISTCHECK_IGNORE_ITEM(${dlist})
ENDFOREACH(ITEM ${dlists})
+# At the start, clear the src/other subdirs list so repeated
+# configures will correctly add the required directories
+SET(SRC_OTHER_ADDED_DIRS "" CACHE STRING "initialize 3rd party sub-directories list" FORCE)
+
#-----------------------------------------------------------------------------
# Load some CMake macros to handle the special case of third party libraries.
INCLUDE(${BRLCAD_CMAKE_DIR}/ThirdParty.cmake)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-12-16 16:22:50
|
Revision: 48018
http://brlcad.svn.sourceforge.net/brlcad/?rev=48018&view=rev
Author: starseeker
Date: 2011-12-16 16:22:40 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Needing the C library from a Tcl/Tk package is compilcating things... however, a bit of a pattern is emerging...
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-12-16 06:12:39 UTC (rev 48017)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-12-16 16:22:40 UTC (rev 48018)
@@ -456,25 +456,40 @@
# the C library.
find_library(ITCL_LIBRARY NAMES itcl itcl${ITCL_PACKAGE_VERSION} PATH_SUFFIXES itcl${ITCL_PACKAGE_VERSION})
IF(NOT ITCL_LIBRARY)
- # Have Itcl package, but no C library - we're building.
- SET(${CMAKE_PROJECT_NAME}_ITCL "BUNDLED" CACHE STRING "Couldn't find ITCL_LIBRARY, even though Itcl package is present. Build bundled itcl library." FORCE)
- # We've already call the THIRD_PARTY_TCL_PACKAGE macro at this point.
- # We're enabling, so just do what we need to in this situation
- add_subdirectory(incrTcl/itcl)
- add_dependencies(Itcl tcl)
- include(${CMAKE_CURRENT_SOURCE_DIR}/itcl.dist)
- DISTCHECK_IGNORE(incrTcl/itcl itcl_ignore_files)
- # Now, handle the non-Tcl package aspects that compelled us to revisit
- # the enable decision and turn Itcl on - need C library variables set.
- SET(ITCL_LIBRARY itcl CACHE STRING "ITCL_LIBRARY" FORCE)
- MARK_AS_ADVANCED(ITCL_LIBRARY)
- SET(ITCL_STUB_LIBRARY itclstub CACHE STRING "ITCL_STUB_LIBRARY" FORCE)
- MARK_AS_ADVANCED(ITCL_STUB_LIBRARY)
- get_directory_property(ITCL_INCLUDE_DIRS DIRECTORY incrTcl/itcl DEFINITION ITCL_INCLUDE_DIRS)
- SET(ITCL_INCLUDE_DIRS "${ITCL_INCLUDE_DIRS}" CACHE STRING "Itcl include paths" FORCE)
- MARK_AS_ADVANCED(ITCL_INCLUDE_DIRS)
- SET(ITCL_VERSION "3.4" CACHE STRING "ITCL_VERSION" FORCE)
- SET(ITCL_BIN_PREFIX ${CMAKE_BINARY_DIR}/${LIB_DIR})
+ # Before we force anything, check what BRLCAD_TCL and
+ # BRLCAD_BUNDLED_LIBS say
+ SET(ITCL_DISABLED 0)
+ IF("${${CMAKE_PROJECT_NAME}_TCL}" STREQUAL "SYSTEM")
+ SET(ITCL_DISABLED 1)
+ ENDIF("${${CMAKE_PROJECT_NAME}_TCL}" STREQUAL "SYSTEM")
+ IF("${${CMAKE_PROJECT_NAME}_TCL}" MATCHES "SYSTEM" AND
+ "${${CMAKE_PROJECT_NAME}_BUNDLED_LIBS}" STREQUAL "SYSTEM")
+ SET(ITCL_DISABLED 1)
+ ENDIF("${${CMAKE_PROJECT_NAME}_TCL}" MATCHES "SYSTEM" AND
+ "${${CMAKE_PROJECT_NAME}_BUNDLED_LIBS}" STREQUAL "SYSTEM")
+
+ IF(NOT ITCL_DISABLED)
+ # Have Itcl package, but no C library - we're building.
+ SET(${CMAKE_PROJECT_NAME}_ITCL "BUNDLED" CACHE STRING "Couldn't find ITCL_LIBRARY, even though Itcl package is present. Build bundled itcl library." FORCE)
+ # We've already call the THIRD_PARTY_TCL_PACKAGE macro at this point.
+ # We're enabling, so just do what we need to in this situation
+ # Distcheck has already been told to ignore this directory
+ # altogether by THIRD_PARTY_TCL_PACKAGE, so we don't need to do
+ # tell it again. Slightly unfortunate in that distcheck won't
+ # pick up issues with Itcl's build logic.
+ add_subdirectory(incrTcl/itcl)
+ add_dependencies(Itcl tcl)
+ # Now, handle the non-Tcl package aspects that compelled us to revisit
+ # the enable decision and turn Itcl on - need C library variables set.
+ SET(ITCL_LIBRARY itcl CACHE STRING "ITCL_LIBRARY" FORCE)
+ MARK_AS_ADVANCED(ITCL_LIBRARY)
+ SET(ITCL_STUB_LIBRARY itclstub CACHE STRING "ITCL_STUB_LIBRARY" FORCE)
+ MARK_AS_ADVANCED(ITCL_STUB_LIBRARY)
+ get_directory_property(ITCL_INCLUDE_DIRS DIRECTORY incrTcl/itcl DEFINITION ITCL_INCLUDE_DIRS)
+ SET(ITCL_INCLUDE_DIRS "${ITCL_INCLUDE_DIRS}" CACHE STRING "Itcl include paths" FORCE)
+ SET(ITCL_VERSION "3.4" CACHE STRING "ITCL_VERSION" FORCE)
+ SET(ITCL_BIN_PREFIX ${CMAKE_BINARY_DIR}/${LIB_DIR})
+ ENDIF(NOT ITCL_DISABLED)
ELSE(NOT ITCL_LIBRARY)
# We have Itcl package AND Itcl library - we're good.
SET(ITCL_VERSION "${ITCL_PACKAGE_VERSION}" CACHE STRING "ITCL_VERSION" FORCE)
@@ -515,19 +530,35 @@
IF(BRLCAD_ENABLE_TK)
find_library(ITK_LIBRARY NAMES itk itk${ITCL_PACKAGE_VERSION} PATH_SUFFIXES itk${ITCL_PACKAGE_VERSION})
IF(NOT ITK_LIBRARY OR NOT ITCL_LIBRARY)
- # Have Itcl/Itk packages, but missing one or more of the C libraries - we're building.
- SET(${CMAKE_PROJECT_NAME}_ITK "BUNDLED" CACHE STRING "Couldn't find incrTcl libraries, even though packages are present. Build bundled itk library." FORCE)
- # We've already call the THIRD_PARTY_TCL_PACKAGE macro at this point.
- # We're enabling, so just do what we need to in this situation
- add_subdirectory(incrTcl/itk)
- add_dependencies(Itcl tcl)
- include(${CMAKE_CURRENT_SOURCE_DIR}/itk.dist)
- DISTCHECK_IGNORE(incrTcl/itk itk_ignore_files)
- # Now, handle the non-Tcl package aspects that compelled us to revisit
- # the enable decision and turn Itcl on - need C library variables set.
- SET(ITK_LIBRARY itk CACHE STRING "ITK_LIBRARY" FORCE)
+ # Before we force anything, check what BRLCAD_TCL and
+ # BRLCAD_BUNDLED_LIBS say
+ SET(ITK_DISABLED 0)
+ IF("${${CMAKE_PROJECT_NAME}_TCL}" STREQUAL "SYSTEM")
+ SET(ITK_DISABLED 1)
+ ENDIF("${${CMAKE_PROJECT_NAME}_TCL}" STREQUAL "SYSTEM")
+ IF("${${CMAKE_PROJECT_NAME}_TCL}" MATCHES "SYSTEM" AND
+ "${${CMAKE_PROJECT_NAME}_BUNDLED_LIBS}" STREQUAL "SYSTEM")
+ SET(ITK_DISABLED 1)
+ ENDIF("${${CMAKE_PROJECT_NAME}_TCL}" MATCHES "SYSTEM" AND
+ "${${CMAKE_PROJECT_NAME}_BUNDLED_LIBS}" STREQUAL "SYSTEM")
+
+ IF(NOT ITK_DISABLED)
+ # Have Itcl/Itk packages, but missing one or more of the C libraries - we're building.
+ SET(${CMAKE_PROJECT_NAME}_ITK "BUNDLED" CACHE STRING "Couldn't find incrTcl libraries, even though packages are present. Build bundled itk library." FORCE)
+ # We've already call the THIRD_PARTY_TCL_PACKAGE macro at this point.
+ # We're enabling, so just do what we need to in this situation.
+ # Distcheck has already been told to ignore this directory
+ # altogether by THIRD_PARTY_TCL_PACKAGE, so we don't need to do
+ # tell it again. Slightly unfortunate in that distcheck won't
+ # pick up issues with Itk's build logic.
+ add_subdirectory(incrTcl/itk)
+ add_dependencies(Itcl tcl)
+ # Now, handle the non-Tcl package aspects that compelled us to revisit
+ # the enable decision and turn Itcl on - need C library variables set.
+ SET(ITK_LIBRARY itk CACHE STRING "ITK_LIBRARY" FORCE)
+ SET(ITK_VERSION "3.3" CACHE STRING "ITK_VERSION" FORCE)
+ ENDIF(NOT ITK_DISABLED)
MARK_AS_ADVANCED(ITK_LIBRARY)
- SET(ITK_VERSION "3.3" CACHE STRING "ITK_VERSION" FORCE)
ELSE(NOT ITK_LIBRARY OR NOT ITCL_LIBRARY)
# We have Itcl/Itk packages AND Itcl/Itk libraries - we're good.
SET(ITK_VERSION "${ITCL_VERSION}" CACHE STRING "ITK_VERSION" FORCE)
@@ -580,10 +611,12 @@
SET(${CMAKE_PROJECT_NAME}_TOGL "BUNDLED" CACHE STRING "Couldn't find TOGL_LIBRARY, even though Itcl package is present. Build bundled itcl library." FORCE)
# We've already call the THIRD_PARTY_TCL_PACKAGE macro at this point.
# We're enabling, so just do what we need to in this situation
+ # Distcheck has already been told to ignore this directory
+ # altogether by THIRD_PARTY_TCL_PACKAGE, so we don't need to do
+ # tell it again. Slightly unfortunate in that distcheck won't
+ # pick up issues with Togl's build logic.
add_subdirectory(togl)
add_dependencies(togl tcl tk)
- include(${CMAKE_CURRENT_SOURCE_DIR}/togl.dist)
- DISTCHECK_IGNORE(togl togl_ignore_files)
# Now, handle the non-Tcl package aspects that compelled us to revisit
# the enable decision and turn Itcl on - need C library variables set.
SET(TOGL_LIBRARIES togl CACHE STRING "TOGL_LIBRARIES" FORCE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-12-16 16:59:50
|
Revision: 48019
http://brlcad.svn.sourceforge.net/brlcad/?rev=48019&view=rev
Author: starseeker
Date: 2011-12-16 16:59:43 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
We need the ITCL version set for find_library... since we aren't testing for it when we're going whole-hog system, set it to 3.4 if it's not defined.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-12-16 16:22:40 UTC (rev 48018)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-12-16 16:59:43 UTC (rev 48019)
@@ -454,6 +454,9 @@
# If the decision is NOT to build it, remember that we also need the C
# library and Tcl/Tk package detection doesn't guarantee that. Look for
# the C library.
+ IF(NOT ITCL_PACKAGE_VERSION)
+ SET(ITCL_PACKAGE_VERSION "3.4")
+ ENDIF(NOT ITCL_PACKAGE_VERSION)
find_library(ITCL_LIBRARY NAMES itcl itcl${ITCL_PACKAGE_VERSION} PATH_SUFFIXES itcl${ITCL_PACKAGE_VERSION})
IF(NOT ITCL_LIBRARY)
# Before we force anything, check what BRLCAD_TCL and
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-12-16 18:03:19
|
Revision: 48024
http://brlcad.svn.sourceforge.net/brlcad/?rev=48024&view=rev
Author: starseeker
Date: 2011-12-16 18:03:12 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Rework explanatory text for lemon
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-12-16 17:52:47 UTC (rev 48023)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-12-16 18:03:12 UTC (rev 48024)
@@ -87,16 +87,19 @@
#
# http://gentoo-overlays.zugaina.org/gentoo-zh/portage/dev-util/lemon/
#
+# LEMON packages for other major Linux/BSD distros will do the same.
# BRL-CAD's FindLEMON.cmake macros will look for the template file in
# the executable directory first, and if not there will check in
-# /usr/share/lemon (the location used by the above ebuild) but it is
-# not possible to list all possible locations for such a non-standard
-# situation. If your distribution DOES have a working lemon with a
-# template file in a custom location, specify the full path to the
-# template with the variable LEMON_TEMPLATE - something like:
+# /usr/share/lemon (the location used by several distributions.)
+# If your distribution has a working lemon with the lempar.c template
+# file in a custom location, specify the full path to the template
+# with the variable LEMON_TEMPLATE - something like:
#
# cmake .. -DLEMON_TEMPLATE=/etc/lemon/lempar.c
#
+# This is not to tell LEMON what template to use - that information is
+# usually hardcoded in LEMON itself - but to let FindLEMON.cmake know
+# there is a working LEMON installation.
SET(lemon_ALIASES ENABLE_LEMON)
SET(lemon_DESCRIPTION "
Option for enabling and disabling compilation of the lemon parser
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sta...@us...> - 2011-12-21 05:25:15
|
Revision: 48097
http://brlcad.svn.sourceforge.net/brlcad/?rev=48097&view=rev
Author: starseeker
Date: 2011-12-21 05:25:08 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
only look for tk.h if we actually want Tk...
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-12-21 01:07:43 UTC (rev 48096)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-12-21 05:25:08 UTC (rev 48097)
@@ -400,7 +400,9 @@
FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_TK_H 1\n")
MARK_AS_ADVANCED(TK-ENABLE_FREETYPE)
ELSE(BRLCAD_TK_BUILD)
- BRLCAD_INCLUDE_FILE(tk.h HAVE_TK_H)
+ IF(BRLCAD_ENABLE_TK)
+ BRLCAD_INCLUDE_FILE(tk.h HAVE_TK_H)
+ ENDIF(BRLCAD_ENABLE_TK)
ENDIF(BRLCAD_TK_BUILD)
MARK_AS_ADVANCED(TK_INCLUDE_PATH)
MARK_AS_ADVANCED(TK_LIBRARY)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <n_...@us...> - 2011-12-30 18:47:32
|
Revision: 48179
http://brlcad.svn.sourceforge.net/brlcad/?rev=48179&view=rev
Author: n_reed
Date: 2011-12-30 18:47:25 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
condition SCL build on perplex/lemon rather than lex/yacc
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-12-29 23:32:15 UTC (rev 48178)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-12-30 18:47:25 UTC (rev 48179)
@@ -624,7 +624,7 @@
THIRD_PARTY(openNURBS openNURBS "" opennurbs_ALIASES opennurbs_DESCRIPTION NOSYS)
# STEP Class Libraries
-# If we don't have Lex/Yacc, we can't do STEP - conditionalize
+# Need Lemon/Perplex to build STEP - conditionalize
set(scl_ALIASES ENABLE_SCL ENABLE_STEP ENABLE_STEP_CLASS_LIBRARIES)
set(scl_DESCRIPTION "
Option for enabling and disabling compilation of the NIST Step Class
@@ -632,7 +632,7 @@
AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
-THIRD_PARTY(scl step "YACC_EXECUTABLE;LEX_EXECUTABLE" scl_ALIASES scl_DESCRIPTION NOSYS)
+THIRD_PARTY(scl step "LEMON_EXECUTABLE;PERPLEX_EXECUTABLE" scl_ALIASES scl_DESCRIPTION NOSYS)
IF(BRLCAD_SCL_BUILD)
SET(FEDEX_PLUS_EXEC fedex_plus CACHE STRING "Fedex plus executable" FORCE)
MARK_AS_ADVANCED(FEDEX_PLUS_EXEC)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X