Revision: 77800
http://sourceforge.net/p/brlcad/code/77800
Author: starseeker
Date: 2020-11-21 22:44:43 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
First cut at handling Tcl/Tk outputs for OpenBSD.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/tcl.cmake
brlcad/branches/extbuild/src/other/ext/tk.cmake
Modified: brlcad/branches/extbuild/src/other/ext/tcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-11-21 22:38:46 UTC
(rev 77799)
+++ brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-11-21 22:44:43 UTC
(rev 77800)
@@ -65,8 +65,15 @@
message(FATAL_ERROR "Bundled Tcl enabled, but the path
\"${CMAKE_CURRENT_BINARY_DIR}\" contains spaces. On this platform, Tcl uses
autotools to build; paths with spaces are not supported. To continue you must
select a build directory with a path that does not use spaces.")
endif ("${CMAKE_CURRENT_BINARY_DIR}" MATCHES ".* .*")
- set(TCL_BASENAME libtcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
- set(TCL_STUBNAME libtclstub${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
+ if (OPENBSD)
+ set(TCL_BASENAME libtcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
+ set(TCL_STUBNAME libtclstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
+ set(TCL_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.1.0)
+ else (OPENBSD)
+ set(TCL_BASENAME libtcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
+ set(TCL_STUBNAME libtclstub${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
+ set(TCL_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ endif (OPENBSD)
set(TCL_EXECNAME tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
set(TCL_PATCH_FILES "${TCL_SRC_DIR}/unix/configure"
"${TCL_SRC_DIR}/macosx/configure" "${TCL_SRC_DIR}/unix/tcl.m4")
@@ -90,6 +97,7 @@
set(TCL_BASENAME tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
set(TCL_STUBNAME tclstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
set(TCL_EXECNAME tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
+ set(TCL_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
ExternalProject_Add(TCL_BLD
URL "${CMAKE_CURRENT_SOURCE_DIR}/tcl"
@@ -107,7 +115,7 @@
# Tell the parent build about files and libraries
ExternalProject_Target(SHARED tcl TCL_BLD ${TCL_INSTDIR}
- ${TCL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ ${TCL_BASENAME}${TCL_SUFFIX}
RPATH
)
Modified: brlcad/branches/extbuild/src/other/ext/tk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-11-21 22:38:46 UTC
(rev 77799)
+++ brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-11-21 22:44:43 UTC
(rev 77800)
@@ -47,8 +47,16 @@
message(FATAL_ERROR "Bundled Tk enabled, but the path
\"${CMAKE_CURRENT_BINARY_DIR}\" contains spaces. On this platform, Tk uses
autotools to build; paths with spaces are not supported. To continue you must
select a build directory with a path that does not use spaces.")
endif ("${CMAKE_CURRENT_BINARY_DIR}" MATCHES ".* .*")
- set(TK_BASENAME libtk${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
- set(TK_STUBNAME libtkstub${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
+ if (OPENBSD)
+ set(TK_BASENAME libtk${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
+ set(TK_STUBNAME libtkstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
+ set(TK_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.1.0)
+ else (OPENBSD)
+ set(TK_BASENAME libtk${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
+ set(TK_STUBNAME libtkstub${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
+ set(TK_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ endif (OPENBSD)
+
set(TK_WISHNAME wish${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
set(TK_PATCH_FILES "${TK_SRC_DIR}/unix/configure"
"${TK_SRC_DIR}/macosx/configure" "${TK_SRC_DIR}/unix/tcl.m4")
@@ -69,6 +77,7 @@
set(TK_BASENAME tk${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
set(TK_STUBNAME tkstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
+ set(TK_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
set(TK_WISHNAME wish${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
ExternalProject_Add(TK_BLD
@@ -89,7 +98,7 @@
# Tell the parent build about files and libraries
ExternalProject_Target(SHARED tk TK_BLD ${TK_INSTDIR}
- ${TK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ ${TK_BASENAME}${TK_SUFFIX}
RPATH
)
ExternalProject_Target(STATIC tkstub TK_BLD ${TK_INSTDIR}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
