Revision: 77300
http://sourceforge.net/p/brlcad/code/77300
Author: starseeker
Date: 2020-10-01 12:05:10 +0000 (Thu, 01 Oct 2020)
Log Message:
-----------
various fixes to superbuild project values
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
brlcad/branches/thirdparty_rework/src/superbuild/openNURBS.cmake
brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
brlcad/branches/thirdparty_rework/src/superbuild/tkhtml.cmake
brlcad/branches/thirdparty_rework/src/superbuild/tktable.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-01
10:58:21 UTC (rev 77299)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-01
12:05:10 UTC (rev 77300)
@@ -105,8 +105,6 @@
ExternalProject_ByProducts(ITK_BLD ${INCLUDE_DIR}
itk.h
itkDecls.h
- itkInt.h
- itkIntDecls.h
)
ExternalProject_ByProducts(ITK_BLD ${LIB_DIR}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
2020-10-01 10:58:21 UTC (rev 77299)
+++ brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
2020-10-01 12:05:10 UTC (rev 77300)
@@ -21,9 +21,10 @@
set(IWIDGETS_SRC_DIR
"${CMAKE_CURRENT_BINARY_DIR}/IWIDGETS_BLD-prefix/src/IWIDGETS_BLD")
- set(IWIDGETS_MAJOR_VERSION 3)
- set(IWIDGETS_MINOR_VERSION 4)
- set(IWIDGETS_VERSION ${IWIDGETS_MAJOR_VERSION}.${IWIDGETS_MINOR_VERSION})
+ set(IWIDGETS_MAJOR_VERSION 4)
+ set(IWIDGETS_MINOR_VERSION 1)
+ 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")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-01 10:58:21 UTC (rev 77299)
+++ brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-01 12:05:10 UTC (rev 77300)
@@ -9,9 +9,9 @@
if (${CMAKE_PROJECT_NAME}_NETPBM_BUILD)
if (MSVC)
- set(NETPBM_BASENAME regex_brl)
+ set(NETPBM_BASENAME netpbm)
else (MSVC)
- set(NETPBM_BASENAME libregex_brl)
+ set(NETPBM_BASENAME libnetpbm)
endif (MSVC)
ExternalProject_Add(NETPBM_BLD
Modified: brlcad/branches/thirdparty_rework/src/superbuild/openNURBS.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/openNURBS.cmake
2020-10-01 10:58:21 UTC (rev 77299)
+++ brlcad/branches/thirdparty_rework/src/superbuild/openNURBS.cmake
2020-10-01 12:05:10 UTC (rev 77300)
@@ -36,7 +36,7 @@
ExternalProject_Target(openNURBS OPENNURBS_BLD
OUTPUT_FILE ${OPENNURBS_BASENAME}${OPENNURBS_SUFFIX}
STATIC_OUTPUT_FILE ${OPENNURBS_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS
"${OPENNURBS_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${OPENNURBS_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${OPENNURBS_MAJOR_VERSION}"
+ SYMLINKS "${OPENNURBS_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
LINK_TARGET "${OPENNURBS_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
STATIC_LINK_TARGET "${OPENNURBS_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
RPATH
Modified: brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-01 10:58:21 UTC (rev 77299)
+++ brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-01 12:05:10 UTC (rev 77300)
@@ -20,9 +20,9 @@
if (MSVC)
set(SC_PREFIX "")
- set(SC_SUFFIX "")
+ set(SC_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
else (MSVC)
- set(SC_PREFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(SC_PREFIX "lib")
set(SC_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}.${SC_VERSION}")
endif (MSVC)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tkhtml.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tkhtml.cmake
2020-10-01 10:58:21 UTC (rev 77299)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tkhtml.cmake
2020-10-01 12:05:10 UTC (rev 77300)
@@ -33,7 +33,7 @@
set(TKHTML_VERSION_MAJOR 3)
set(TKHTML_VERSION_MINOR 0)
- set(TKHTML_VERSION ${TKHTML_VERSION_MINOR}.${TKHTML_VERSION_MINOR})
+ set(TKHTML_VERSION ${TKHTML_VERSION_MAJOR}.${TKHTML_VERSION_MINOR})
if (MSVC)
set(TKHTML_BASENAME Tkhtml${TKHTML_VERSION_MAJOR}.${TK_VERSION_MINOR})
@@ -60,7 +60,7 @@
DEPENDS ${TCL_TARGET} ${TK_TARGET}
)
ExternalProject_Target(tkhtml TKHTML_BLD
- SUBDIR Tkhtml${TKHTML_VERSION}
+ #SUBDIR Tkhtml${TKHTML_VERSION}
OUTPUT_FILE ${TKHTML_BASENAME}${TKHTML_SUFFIX}
SYMLINKS "${TKHTML_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
LINK_TARGET "${TKHTML_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tktable.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tktable.cmake
2020-10-01 10:58:21 UTC (rev 77299)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tktable.cmake
2020-10-01 12:05:10 UTC (rev 77300)
@@ -33,7 +33,7 @@
set(TKTABLE_VERSION_MAJOR 2)
set(TKTABLE_VERSION_MINOR 10)
- set(TKTABLE_VERSION ${TKTABLE_VERSION_MINOR}.${TKTABLE_VERSION_MINOR})
+ set(TKTABLE_VERSION ${TKTABLE_VERSION_MAJOR}.${TKTABLE_VERSION_MINOR})
if (MSVC)
set(TKTABLE_BASENAME Tktable${TKTABLE_VERSION_MAJOR}.${TK_VERSION_MINOR})
@@ -60,7 +60,7 @@
DEPENDS ${TCL_TARGET} ${TK_TARGET}
)
ExternalProject_Target(tktable TKTABLE_BLD
- SUBDIR Tktable${TKTABLE_VERSION}
+ #SUBDIR Tktable${TKTABLE_VERSION}
OUTPUT_FILE ${TKTABLE_BASENAME}${TKTABLE_SUFFIX}
SYMLINKS "${TKTABLE_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
LINK_TARGET "${TKTABLE_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
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
