Revision: 77372
http://sourceforge.net/p/brlcad/code/77372
Author: starseeker
Date: 2020-10-08 22:24:45 +0000 (Thu, 08 Oct 2020)
Log Message:
-----------
Enable netpbm
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-08 21:52:21 UTC (rev 77371)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-08 22:24:45 UTC (rev 77372)
@@ -28,7 +28,7 @@
project(BDEPS)
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.14)
# Find the executable extension, if there is one
get_filename_component(EXE_EXT "${CMAKE_COMMAND}" EXT)
@@ -204,8 +204,8 @@
# libregex regular expression matching
include(${CMAKE_CURRENT_SOURCE_DIR}/regex.cmake)
-## netpbm library - support for pnm,ppm,pbm, etc. image files
-#include(${CMAKE_CURRENT_SOURCE_DIR}/netpbm.cmake)
+# netpbm library - support for pnm,ppm,pbm, etc. image files
+include(${CMAKE_CURRENT_SOURCE_DIR}/netpbm.cmake)
#
## libpng - Portable Network Graphics image file support
#include(${CMAKE_CURRENT_SOURCE_DIR}/png.cmake)
@@ -228,51 +228,6 @@
#include(${CMAKE_CURRENT_SOURCE_DIR}/itcl.cmake)
#include(${CMAKE_CURRENT_SOURCE_DIR}/itk.cmake)
#include(${CMAKE_CURRENT_SOURCE_DIR}/iwidgets.cmake)
-#
-## For anything we've built here, we need to let the parent build know
-## where to go looking for key components
-#if (TARGET PERPLEX_BLD)
-# file(APPEND "${SUPERBUILD_OUT}" "set(LEMON_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
-# file(APPEND "${SUPERBUILD_OUT}" "set(LEMON_TEMPLATE
${BRLCAD_BINARY_DIR}/${DATA_DIR}/lemon/lempar.c)\n")
-# file(APPEND "${SUPERBUILD_OUT}" "set(RE2C_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
-# file(APPEND "${SUPERBUILD_OUT}" "set(PERPLEX_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
-# file(APPEND "${SUPERBUILD_OUT}" "set(PERPLEX_TEMPLATE
${BRLCAD_BINARY_DIR}/${DATA_DIR}/perplex/perplex_template.c)\n")
-#else (TARGET PERPLEX_BLD)
-# message(FATAL_ERROR "Failed to build perplex\n")
-#endif (TARGET PERPLEX_BLD)
-#if (TARGET NETPBM_BLD)
-# file(APPEND "${SUPERBUILD_OUT}" "set(NETPBM_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
-#endif (TARGET NETPBM_BLD)
-#if (TARGET STEPCODE_BLD)
-# file(APPEND "${SUPERBUILD_OUT}" "set(STEPCODE_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
-#endif (TARGET STEPCODE_BLD)
-#if (TARGET BSON_BLD)
-# file(APPEND "${SUPERBUILD_OUT}" "set(BSON_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
-#endif (TARGET BSON_BLD)
-#if (TARGET PROJ4_BLD)
-# file(APPEND "${SUPERBUILD_OUT}" "set(PROJ4_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
-#endif (TARGET PROJ4_BLD)
-#if (TARGET GDAL_BLD)
-# file(APPEND "${SUPERBUILD_OUT}" "set(GDAL_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
-#endif (TARGET GDAL_BLD)
-#if (TARGET TCL_BLD)
-# file(APPEND "${SUPERBUILD_OUT}" "set(TCL_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
-#endif (TARGET TCL_BLD)
-#
-## (For REGEX, ZLIB and PNG we need to do a little extra work and supply our
-## custom library names so find_package knows about them.)
-#if (TARGET REGEX_BLD)
-# file(APPEND "${SUPERBUILD_OUT}" "set(REGEX_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
-# file(APPEND "${SUPERBUILD_OUT}" "set(REGEX_LIBRARY
\"${BRLCAD_BINARY_DIR}/${LIB_DIR}/${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\")\n")
-#endif (TARGET REGEX_BLD)
-#if (TARGET ZLIB_BLD)
-# file(APPEND "${SUPERBUILD_OUT}" "set(ZLIB_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
-# file(APPEND "${SUPERBUILD_OUT}" "set(ZLIB_LIBRARY
\"${BRLCAD_BINARY_DIR}/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\")\n")
-#endif (TARGET ZLIB_BLD)
-#if (TARGET PNG_BLD)
-# file(APPEND "${SUPERBUILD_OUT}" "set(PNG_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
-# file(APPEND "${SUPERBUILD_OUT}" "set(PNG_LIBRARY
\"${BRLCAD_BINARY_DIR}/${LIB_DIR}/${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\")\n")
-#endif (TARGET PNG_BLD)
# Local Variables:
# tab-width: 8
Modified: brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-08 21:52:21 UTC (rev 77371)
+++ brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-08 22:24:45 UTC (rev 77372)
@@ -14,43 +14,41 @@
set(NETPBM_BASENAME libnetpbm)
endif (MSVC)
+ set(NETPBM_INSTDIR ${CMAKE_BINARY_DIR}/netpbm)
+
ExternalProject_Add(NETPBM_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/netpbm"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DLIB_DIR=${LIB_DIR} -DBIN_DIR=${BIN_DIR}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${NETPBM_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
)
- # Tell the parent build about files and libraries
- file(APPEND "${SUPERBUILD_OUT}" "
- ExternalProject_Target(netpbm NETPBM_BLD
- OUTPUT_FILE ${NETPBM_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
- STATIC_OUTPUT_FILE ${NETPBM_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- RPATH
- )
+ # Tell the parent build about files and libraries
+ ExternalProject_Target(netpbm NETPBM_BLD ${NETPBM_INSTDIR}
+ SHARED ${LIB_DIR}/${NETPBM_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ STATIC ${LIB_DIR}/${NETPBM_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ RPATH
+ )
- ExternalProject_ByProducts(NETPBM_BLD ${INCLUDE_DIR}
- netpbm/bitio.h
- netpbm/colorname.h
- netpbm/pam.h
- netpbm/pammap.h
- netpbm/pbm.h
- netpbm/pbmfont.h
- netpbm/pgm.h
- netpbm/pm.h
- netpbm/pm_gamma.h
- netpbm/pm_system.h
- netpbm/pnm.h
- netpbm/ppm.h
- netpbm/ppmcmap.h
- netpbm/ppmfloyd.h
- )
- \n")
+ ExternalProject_ByProducts(netpbm NETPBM_BLD ${NETPBM_INSTDIR}
${INCLUDE_DIR}/netpbm ${INCLUDE_DIR}/netpbm
+ bitio.h
+ colorname.h
+ pam.h
+ pammap.h
+ pbm.h
+ pbmfont.h
+ pgm.h
+ pm.h
+ pm_gamma.h
+ pm_system.h
+ pnm.h
+ ppm.h
+ ppmcmap.h
+ ppmfloyd.h
+ )
- list(APPEND BRLCAD_DEPS NETPBM_BLD)
-
set(NETPBM_LIBRARIES netpbm CACHE STRING "Building bundled netpbm" FORCE)
- set(NETPBM_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INCLUDE_DIR}/netpbm"
CACHE STRING "Directory containing netpbm headers." FORCE)
+ set(NETPBM_INCLUDE_DIRS
"${CMAKE_INSTALL_PREFIX}/$<CONFIG>/${INCLUDE_DIR}/netpbm" CACHE STRING
"Directory containing netpbm headers." FORCE)
SetTargetFolder(NETPBM_BLD "Third Party Libraries")
SetTargetFolder(netpbm "Third Party Libraries")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
2020-10-08 21:52:21 UTC (rev 77371)
+++ brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
2020-10-08 22:24:45 UTC (rev 77372)
@@ -40,7 +40,7 @@
STATIC_LINK_TARGET ${REGEX_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
RPATH
)
- ExternalProject_ByProducts(REGEX_BLD ${REGEX_INSTDIR} ${INCLUDE_DIR}
${INCLUDE_DIR}
+ ExternalProject_ByProducts(regex REGEX_BLD ${REGEX_INSTDIR} ${INCLUDE_DIR}
${INCLUDE_DIR}
regex.h
)
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
