Revision: 76980
http://sourceforge.net/p/brlcad/code/76980
Author: starseeker
Date: 2020-08-27 18:21:43 +0000 (Thu, 27 Aug 2020)
Log Message:
-----------
Merge from trunk: r76975 through r76979
Modified Paths:
--------------
brlcad/branches/RELEASE/src/external/Creo/CMakeLists.txt
brlcad/branches/RELEASE/src/other/CMakeLists.txt
Property Changed:
----------------
brlcad/branches/RELEASE/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-08-27 15:43:33 UTC (rev 76979)
+++ brlcad/branches/RELEASE 2020-08-27 18:21:43 UTC (rev 76980)
Property changes on: brlcad/branches/RELEASE
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76768,76771-76954,76963-76967
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76768,76771-76954,76963-76967,76975-76979
\ No newline at end of property
Modified: brlcad/branches/RELEASE/src/external/Creo/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/external/Creo/CMakeLists.txt 2020-08-27
15:43:33 UTC (rev 76979)
+++ brlcad/branches/RELEASE/src/external/Creo/CMakeLists.txt 2020-08-27
18:21:43 UTC (rev 76980)
@@ -81,12 +81,9 @@
endif(NOT "${CMAKE_GENERATOR_TOOLSET}" STREQUAL "v110_xp")
endif("${CREO_VERSION}" VERSION_GREATER "2.9999" AND "${CREO_VERSION}"
VERSION_LESS "4.0")
- # There will be a sub-directory that is specific to the installed
+ # There may be a sub-directory that is specific to the installed
# version of CREO - find it
file(GLOB MDIR RELATIVE "${CREO_ROOT_DIR}" "${CREO_ROOT_DIR}/M*" )
- if(NOT MDIR)
- message(FATAL_ERROR "No directory matching the pattern M* found in
${CREO_ROOT_DIR}. This may indicate the CREO installation directory
conventions have changed - if so, the CMakeLists.txt file will need to be
updated to reflect the new path structures.")
- endif(NOT MDIR)
# Define a variable for the current CREO platform
set(CREO_OS_VERSION x86e_win64)
@@ -207,17 +204,16 @@
libbn
libbrep
libbu
- libgdiam
- liblz4
libnmg
- libp2t
librt
- libvds
libwdb
+ SPSR
+ gdiam
openNURBS
- regex
- zlib1
- libSPSR
+ poly2tri
+ regex_brl
+ vds
+ z_brl1
)
set(BRLCAD_STATIC_LIBS)
set(brlcadlibs_notinstalled)
@@ -228,11 +224,11 @@
endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
configure_file(${BRLCAD_ROOT_DIR}/bin/${blib}.dll
${CMAKE_CURRENT_BINARY_DIR}/${blib}.dll COPYONLY)
# Sigh - zlib doesn't follow the general pattern
- if("${blib}" STREQUAL "zlib1")
- set(BRLCAD_STATIC_LIBS ${BRLCAD_STATIC_LIBS}
"${BRLCAD_ROOT_DIR}/lib/zlib.lib")
- else("${blib}" STREQUAL "zlib1")
+ if("${blib}" STREQUAL "z_brl1")
+ set(BRLCAD_STATIC_LIBS ${BRLCAD_STATIC_LIBS}
"${BRLCAD_ROOT_DIR}/lib/z_brl.lib")
+ else("${blib}" STREQUAL "z_brl1")
set(BRLCAD_STATIC_LIBS ${BRLCAD_STATIC_LIBS}
"${BRLCAD_ROOT_DIR}/lib/${blib}.lib")
- endif("${blib}" STREQUAL "zlib1")
+ endif("${blib}" STREQUAL "z_brl1")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${blib}.dll DESTINATION
"${MDIR}/${CREO_OBJ_DIR}")
if(NOT EXISTS ${CREO_ROOT_DIR}/${MDIR}/${CREO_OBJ_DIR}/${blib}.dll)
set(brlcadlibs_notinstalled "${brlcadlibs_notinstalled}\n
${blib}.dll")
Modified: brlcad/branches/RELEASE/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/other/CMakeLists.txt 2020-08-27 15:43:33 UTC
(rev 76979)
+++ brlcad/branches/RELEASE/src/other/CMakeLists.txt 2020-08-27 18:21:43 UTC
(rev 76980)
@@ -124,6 +124,13 @@
if (NOT BRLCAD_REGEX_BUILD)
set(REGEX_LIBRARIES ${REGEX_LIBRARY} CACHE STRING "REGEX_LIBRARIES" FORCE)
set(REGEX_INCLUDE_DIRS "${REGEX_INCLUDE_DIR}" CACHE STRING "REGEX include
directory" FORCE)
+else (NOT BRLCAD_REGEX_BUILD)
+ # Our own code (at least the Creo plugin, maybe others) may require our
+ # regex.h to build if compiling against an installed BRL-CAD's libs.
+ # Explicitly override the general suppression of header installs in this
+ # specific case.
+ get_directory_property(REGEX_HDRS DIRECTORY libregex DEFINITION REGEX_HDRS)
+ install(FILES ${REGEX_HDRS} DESTINATION ${INCLUDE_DIR})
endif (NOT BRLCAD_REGEX_BUILD)
# Same deal for zlib Library - common requirement, deal with it up front
@@ -144,6 +151,12 @@
add_definitions(-DZ_PREFIX)
add_definitions(-DZ_PREFIX_STR=${Z_PREFIX_STR})
set(Z_PREFIX_STR "${Z_PREFIX_STR}" CACHE STRING "prefix for zlib functions"
FORCE)
+ # Our own code (at least logic using OpenNURBS, maybe others) can require our
+ # zlib.h to build if compiling against an installed BRL-CAD's libs.
+ # Explicitly override the general suppression of header installs in this
+ # specific case.
+ get_directory_property(ZLIB_PUBLIC_HDRS DIRECTORY libz DEFINITION
ZLIB_PUBLIC_HDRS)
+ install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION ${INCLUDE_DIR})
else(BRLCAD_ZLIB_BUILD)
set(Z_PREFIX_STR "" CACHE STRING "clear prefix for zlib functions" FORCE)
set(Z_PREFIX_STR)
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
