Revision: 77371
http://sourceforge.net/p/brlcad/code/77371
Author: starseeker
Date: 2020-10-08 21:52:21 +0000 (Thu, 08 Oct 2020)
Log Message:
-----------
turn on regex build
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-08 20:23:14 UTC (rev 77370)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-08 21:52:21 UTC (rev 77371)
@@ -201,9 +201,9 @@
# zlib compression/decompression library
include(${CMAKE_CURRENT_SOURCE_DIR}/zlib.cmake)
-## libregex regular expression matching
-#include(${CMAKE_CURRENT_SOURCE_DIR}/regex.cmake)
-#
+# 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)
#
Modified: brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
2020-10-08 20:23:14 UTC (rev 77370)
+++ brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
2020-10-08 21:52:21 UTC (rev 77371)
@@ -18,6 +18,8 @@
set(REGEX_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${REGEX_VERSION})
endif (MSVC)
+ set(REGEX_INSTDIR ${CMAKE_BINARY_DIR}/regex)
+
# Platform differences in default linker behavior make it difficult to
# guarantee that our libregex symbols will override libc. We'll avoid the
# issue by renaming our libregex symbols to be incompatible with libc.
@@ -24,30 +26,26 @@
ExternalProject_Add(REGEX_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/regex"
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=${REGEX_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DREGEX_PREFIX_STR=libregex_
)
# Tell the parent build about files and libraries
- file(APPEND "${SUPERBUILD_OUT}" "
- ExternalProject_Target(regex REGEX_BLD
- OUTPUT_FILE ${REGEX_BASENAME}${REGEX_SUFFIX}
- STATIC_OUTPUT_FILE ${REGEX_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS
\"${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1\"
- LINK_TARGET \"${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\"
- STATIC_LINK_TARGET \"${REGEX_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}\"
+ ExternalProject_Target(regex REGEX_BLD ${REGEX_INSTDIR}
+ SHARED ${LIB_DIR}/${REGEX_BASENAME}${REGEX_SUFFIX}
+ STATIC ${LIB_DIR}/${REGEX_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ SYMLINKS
${LIB_DIR}/${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${LIB_DIR}/${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1
+ LINK_TARGET ${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ STATIC_LINK_TARGET ${REGEX_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
RPATH
)
- ExternalProject_ByProducts(REGEX_BLD ${INCLUDE_DIR}
+ ExternalProject_ByProducts(REGEX_BLD ${REGEX_INSTDIR} ${INCLUDE_DIR}
${INCLUDE_DIR}
regex.h
)
- \n")
- list(APPEND BRLCAD_DEPS REGEX_BLD)
-
set(REGEX_LIBRARIES regex CACHE STRING "Building bundled libregex" FORCE)
- set(REGEX_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INCLUDE_DIR}" CACHE STRING
"Directory containing regex headers." FORCE)
+ set(REGEX_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing regex headers." FORCE)
SetTargetFolder(REGEX_BLD "Third Party Libraries")
SetTargetFolder(regex "Third Party Libraries")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake 2020-10-08
20:23:14 UTC (rev 77370)
+++ brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake 2020-10-08
21:52:21 UTC (rev 77371)
@@ -24,16 +24,18 @@
set(ZLIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${ZLIB_VERSION})
endif (MSVC)
+ set(ZLIB_INSTDIR ${CMAKE_BINARY_DIR}/zlib)
+
ExternalProject_Add(ZLIB_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/zlib
-DLIB_DIR=${LIB_DIR} -DBIN_DIR=${BIN_DIR}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${ZLIB_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DZ_PREFIX_STR=${Z_PREFIX_STR}
)
# Tell the parent build about files and libraries
- ExternalProject_Target(zlib ZLIB_BLD ${CMAKE_BINARY_DIR}/zlib
+ ExternalProject_Target(zlib ZLIB_BLD ${ZLIB_INSTDIR}
SHARED ${LIB_DIR}/${ZLIB_BASENAME}${ZLIB_SUFFIX}
STATIC ${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
SYMLINKS
"${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1"
@@ -40,13 +42,13 @@
LINK_TARGET "${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
RPATH
)
- ExternalProject_ByProducts(zlib ZLIB_BLD ${CMAKE_BINARY_DIR}/zlib
${INCLUDE_DIR} ${INCLUDE_DIR}
+ ExternalProject_ByProducts(zlib ZLIB_BLD ${ZLIB_INSTDIR} ${INCLUDE_DIR}
${INCLUDE_DIR}
zconf.h
zlib.h
)
set(ZLIB_LIBRARIES zlib CACHE STRING "Building bundled zlib" FORCE)
- set(ZLIB_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INCLUDE_DIR}" CACHE STRING
"Directory containing zlib headers." FORCE)
+ set(ZLIB_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing zlib headers." FORCE)
SetTargetFolder(ZLIB_BLD "Third Party Libraries")
SetTargetFolder(zlib "Third Party Libraries")
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
