Revision: 77386
http://sourceforge.net/p/brlcad/code/77386
Author: starseeker
Date: 2020-10-09 15:12:44 +0000 (Fri, 09 Oct 2020)
Log Message:
-----------
Enable the remainder of the itcl/itk packages.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-09 14:49:04 UTC (rev 77385)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-09 15:12:44 UTC (rev 77386)
@@ -228,8 +228,8 @@
include(${CMAKE_CURRENT_SOURCE_DIR}/tcl.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/tk.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/itcl.cmake)
-#include(${CMAKE_CURRENT_SOURCE_DIR}/itk.cmake)
-#include(${CMAKE_CURRENT_SOURCE_DIR}/iwidgets.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/itk.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/iwidgets.cmake)
# Local Variables:
# tab-width: 8
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-09
14:49:04 UTC (rev 77385)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-09
15:12:44 UTC (rev 77386)
@@ -126,6 +126,7 @@
ExternalProject_ByProducts(itcl ITCL_BLD ${ITCL_INSTDIR} ${LIB_DIR}
${LIB_DIR}
itcl${ITCL_VERSION}/pkgIndex.tcl
+ itclConfig.sh
FIXPATH
)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-09
14:49:04 UTC (rev 77385)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-09
15:12:44 UTC (rev 77386)
@@ -41,39 +41,42 @@
set(ITK_MINOR_VERSION 4)
set(ITK_VERSION ${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
- set(ITK_PATCH_FILES "${ITK_SRC_DIR}/configure"
"${ITK_SRC_DIR}/tclconfig/tcl.m4")
# If we have build targets, set the variables accordingly. Otherwise,
# we need to find the *Config.sh script locations.
- if (TARGET TCL_BLD)
- set(TCL_TARGET TCL_BLD)
- else (TARGET TCL_BLD)
+ if (TARGET tcl_stage)
+ set(TCL_TARGET tcl_stage)
+ else (TARGET tcl_stage)
get_filename_component(TCLCONF_DIR "${TCL_LIBRARY}" DIRECTORY)
- endif (TARGET TCL_BLD)
+ endif (TARGET tcl_stage)
- if (TARGET ITCL_BLD)
- set(ITCL_TARGET ITCL_BLD)
- else (TARGET ITCL_BLD)
+ if (TARGET itcl_stage)
+ set(ITCL_TARGET itcl_stage)
+ else (TARGET itcl_stage)
find_library(ITCL_LIBRARY NAMES itcl itcl3 PATH_SUFFIXES lib)
get_filename_component(ITCLCONF_DIR "${ITCL_LIBRARY}" DIRECTORY)
- endif (TARGET ITCL_BLD)
+ endif (TARGET itcl_stage)
- if (TARGET TK_BLD)
- set(TK_TARGET TK_BLD)
- else (TARGET TK_BLD)
+ if (TARGET tk_stage)
+ set(TK_TARGET tk_stage)
+ else (TARGET tk_stage)
get_filename_component(TKCONF_DIR "${TK_LIBRARY}" DIRECTORY)
- endif (TARGET TK_BLD)
+ endif (TARGET tk_stage)
+ set(ITK_INSTDIR ${CMAKE_BINARY_DIR}/itk3)
+
if (NOT MSVC)
set(ITK_BASENAME libitk${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
set(ITK_STUBNAME libitkstub${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
+ set(ITK_PATCH_FILES "${ITK_SRC_DIR}/configure"
"${ITK_SRC_DIR}/tclconfig/tcl.m4")
+
ExternalProject_Add(ITK_BLD
URL "${CMAKE_CURRENT_SOURCE_DIR}/itk3"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
PATCH_COMMAND rpath_replace "${CMAKE_BUILD_RPATH}" ${ITK_PATCH_FILES}
- CONFIGURE_COMMAND CPPFLAGS=-I${CMAKE_INSTALL_PREFIX}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_INSTALL_PREFIX}/${LIB_DIR} ${ITK_SRC_DIR}/configure
--prefix=${CMAKE_INSTALL_PREFIX} --exec-prefix=${CMAKE_INSTALL_PREFIX}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_INSTALL_PREFIX}/${LIB_DIR},${TCLCONF_DIR}>
--with-tk=$<IF:$<BOOL:${TK_TARGET}>,${CMAKE_INSTALL_PREFIX}/${LIB_DIR},${TKCONF_DIR}>
--with-itcl=$<IF:$<BOOL:${ITCL_TARGET}>,${CMAKE_INSTALL_PREFIX}/${LIB_DIR},${ITCLCONF_DIR}>
+ CONFIGURE_COMMAND
CPPFLAGS=-I${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR} ${ITK_SRC_DIR}/configure
--prefix=${ITK_INSTDIR} --exec-prefix=${ITK_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${TCLCONF_DIR}>
--with-tk=$<IF:$<BOOL:${TK_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${TKCONF_DIR}>
--with-itcl=$<IF:$<BOOL:${ITCL_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${ITCLCONF_DIR}>
BUILD_COMMAND make -j${pcnt}
INSTALL_COMMAND make install
DEPENDS ${TCL_TARGET} ${TK_TARGET} ${ITCL_TARGET}
@@ -89,8 +92,8 @@
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
CONFIGURE_COMMAND ""
BINARY_DIR ${ITK_SRC_DIR}/win
- BUILD_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc
INSTALLDIR=${CMAKE_INSTALL_PREFIX} TCLDIR=${TCL_SRC_DIR}
- INSTALL_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc install
INSTALLDIR=${CMAKE_INSTALL_PREFIX} TCLDIR=${TCL_SRC_DIR}
+ BUILD_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc
INSTALLDIR=${ITK_INSTDIR} TCLDIR=${TCL_SRC_DIR}
+ INSTALL_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc install
INSTALLDIR=${ITK_INSTDIR} TCLDIR=${TCL_SRC_DIR}
DEPENDS ${TCL_TARGET}
)
@@ -97,19 +100,18 @@
endif (NOT MSVC)
# Tell the parent build about files and libraries
- file(APPEND "${SUPERBUILD_OUT}" "
- ExternalProject_Target(itk ITK_BLD
+ ExternalProject_Target(itk ITK_BLD ${ITK_INSTDIR}
SUBDIR itk${ITK_VERSION}
- OUTPUT_FILE ${ITK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
- STATIC_OUTPUT_FILE ${ITK_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ SHARED
${LIB_DIR}/itk${ITK_VERSION}/${ITK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ STATIC
${LIB_DIR}/itk${ITK_VERSION}/${ITK_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
)
- ExternalProject_ByProducts(ITK_BLD ${INCLUDE_DIR}
+ ExternalProject_ByProducts(itk ITK_BLD ${ITK_INSTDIR} ${INCLUDE_DIR}
${INCLUDE_DIR}
itk.h
itkDecls.h
)
- ExternalProject_ByProducts(ITK_BLD ${LIB_DIR}
+ ExternalProject_ByProducts(itk ITK_BLD ${ITK_INSTDIR} ${LIB_DIR} ${LIB_DIR}
itk${ITK_VERSION}/Archetype.itk
itk${ITK_VERSION}/Toplevel.itk
itk${ITK_VERSION}/Widget.itk
@@ -116,14 +118,12 @@
itk${ITK_VERSION}/itk.tcl
itk${ITK_VERSION}/tclIndex
)
- ExternalProject_ByProducts(ITK_BLD ${LIB_DIR}
+
+ ExternalProject_ByProducts(itk ITK_BLD ${ITK_INSTDIR} ${LIB_DIR} ${LIB_DIR}
itk${ITK_VERSION}/pkgIndex.tcl
FIXPATH
)
- \n")
- list(APPEND BRLCAD_DEPS ITK_BLD)
-
SetTargetFolder(ITK_BLD "Third Party Libraries")
endif (DO_ITK_BUILD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
2020-10-09 14:49:04 UTC (rev 77385)
+++ brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
2020-10-09 15:12:44 UTC (rev 77386)
@@ -26,43 +26,46 @@
set(IWIDGETS_PATCH_VERSION 1)
set(IWIDGETS_VERSION
${IWIDGETS_MAJOR_VERSION}.${IWIDGETS_MINOR_VERSION}.${IWIDGETS_PATCH_VERSION})
- set(IWIDGETS_PATCH_FILES "${IWIDGETS_SRC_DIR}/configure"
"${IWIDGETS_SRC_DIR}/tclconfig/tcl.m4")
-
# If we have build targets, set the variables accordingly. Otherwise,
# we need to find the *Config.sh script locations.
- if (TARGET TCL_BLD)
- set(TCL_TARGET TCL_BLD)
- else (TARGET TCL_BLD)
+ if (TARGET tcl_stage)
+ set(TCL_TARGET tcl_stage)
+ else (TARGET tcl_stage)
get_filename_component(TCLCONF_DIR "${TCL_LIBRARY}" DIRECTORY)
- endif (TARGET TCL_BLD)
+ endif (TARGET tcl_stage)
- if (TARGET ITCL_BLD)
- set(ITCL_TARGET ITCL_BLD)
- else (TARGET ITCL_BLD)
+ if (TARGET itcl_stage)
+ set(ITCL_TARGET itcl_stage)
+ else (TARGET itcl_stage)
find_library(ITCL_LIBRARY NAMES itcl itcl3)
get_filename_component(ITCLCONF_DIR "${ITCL_LIBRARY}" DIRECTORY)
- endif (TARGET ITCL_BLD)
+ endif (TARGET itcl_stage)
- if (TARGET TK_BLD)
- set(TK_TARGET TK_BLD)
- else (TARGET TK_BLD)
+ if (TARGET tk_stage)
+ set(TK_TARGET tk_stage)
+ else (TARGET tk_stage)
get_filename_component(TKCONF_DIR "${TK_LIBRARY}" DIRECTORY)
- endif (TARGET TK_BLD)
+ endif (TARGET tk_stage)
- if (TARGET ITK_BLD)
- set(ITK_TARGET ITK_BLD)
- endif (TARGET ITK_BLD)
+ if (TARGET itk_stage)
+ set(ITK_TARGET itk_stage)
+ endif (TARGET itk_stage)
+
# The Iwidgets build doesn't seem to work with Itk the same way it does
with the other
# dependencies - just point it to our local source copy
set(ITK_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/itk3")
+ set(IWIDGETS_INSTDIR "${CMAKE_BINARY_DIR}/iwidgets")
+
if (NOT MSVC)
+ set(IWIDGETS_PATCH_FILES "${IWIDGETS_SRC_DIR}/configure"
"${IWIDGETS_SRC_DIR}/tclconfig/tcl.m4")
+
ExternalProject_Add(IWIDGETS_BLD
URL "${CMAKE_CURRENT_SOURCE_DIR}/iwidgets"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
PATCH_COMMAND rpath_replace "${CMAKE_BUILD_RPATH}"
${IWIDGETS_PATCH_FILES}
- CONFIGURE_COMMAND CPPFLAGS=-I${CMAKE_INSTALL_PREFIX}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_INSTALL_PREFIX}/${LIB_DIR} ${IWIDGETS_SRC_DIR}/configure
--prefix=${CMAKE_INSTALL_PREFIX} --exec-prefix=${CMAKE_INSTALL_PREFIX}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_INSTALL_PREFIX}/${LIB_DIR},${TCLCONF_DIR}>
--with-tk=$<IF:$<BOOL:${TK_TARGET}>,${CMAKE_INSTALL_PREFIX}/${LIB_DIR},${TKCONF_DIR}>
--with-itcl=$<IF:$<BOOL:${ITCL_TARGET}>,${CMAKE_INSTALL_PREFIX}/${LIB_DIR},${ITCLCONF_DIR}>
--with-itk=${ITK_SOURCE_DIR}
+ CONFIGURE_COMMAND
CPPFLAGS=-I${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}
${IWIDGETS_SRC_DIR}/configure --prefix=${IWIDGETS_INSTDIR}
--exec-prefix=${IWIDGETS_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${TCLCONF_DIR}>
--with-tk=$<IF:$<BOOL:${TK_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${TKCONF_DIR}>
--with-itcl=$<IF:$<BOOL:${ITCL_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${ITCLCONF_DIR}>
--with-itk=${ITK_SOURCE_DIR}
BUILD_COMMAND make -j${pcnt}
INSTALL_COMMAND make install
DEPENDS ${TCL_TARGET} ${TK_TARGET} ${ITCL_TARGET} ${ITK_TARGET}
@@ -75,8 +78,8 @@
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
CONFIGURE_COMMAND ""
BINARY_DIR ${IWIDGETS_SRC_DIR}/win
- BUILD_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc
INSTALLDIR=${CMAKE_INSTALL_PREFIX} TCLDIR=${TCL_SRC_DIR}
- INSTALL_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc install
INSTALLDIR=${CMAKE_INSTALL_PREFIX} TCLDIR=${TCL_SRC_DIR}
+ BUILD_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc
INSTALLDIR=${IWIDGETS_INSTDIR} TCLDIR=${TCL_SRC_DIR}
+ INSTALL_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc install
INSTALLDIR=${IWIDGETS_INSTDIR} TCLDIR=${TCL_SRC_DIR}
DEPENDS ${TCL_TARGET}
)
@@ -83,8 +86,7 @@
endif (NOT MSVC)
# Tell the parent build about files and libraries
- file(APPEND "${SUPERBUILD_OUT}" "
- ExternalProject_ByProducts(IWIDGETS_BLD
${LIB_DIR}/iwidgets${IWIDGETS_VERSION}
+ ExternalProject_ByProducts(iwidgets IWIDGETS_BLD ${IWIDGETS_INSTDIR}
${LIB_DIR}/iwidgets${IWIDGETS_VERSION} ${LIB_DIR}/iwidgets${IWIDGETS_VERSION}
demos/buttonbox
demos/calendar
demos/canvasprintbox
@@ -277,10 +279,7 @@
scripts/unknownimage.gif
scripts/watch.itk
)
- \n")
- list(APPEND BRLCAD_DEPS IWIDGETS_BLD)
-
SetTargetFolder(IWIDGETS_BLD "Third Party Libraries")
endif (DO_IWIDGETS_BUILD)
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
