Revision: 76979
http://sourceforge.net/p/brlcad/code/76979
Author: starseeker
Date: 2020-08-27 15:43:33 +0000 (Thu, 27 Aug 2020)
Log Message:
-----------
Looks like the Creo plugin needs our local versions of these headers on Windows
to build. See if we can override the suppression of the 3rd party header
installs in the specific cases where it is necessary.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-08-27 14:50:09 UTC (rev
76978)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-08-27 15:43:33 UTC (rev
76979)
@@ -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
