Revision: 77396
http://sourceforge.net/p/brlcad/code/77396
Author: starseeker
Date: 2020-10-09 19:57:08 +0000 (Fri, 09 Oct 2020)
Log Message:
-----------
Right, no longer magically picking up the Z_PREFIX define from a zlib build
higher up the src/other CMakeLists.txt... there must be a better way to manage
this...
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-10-09
19:44:40 UTC (rev 77395)
+++ brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-10-09
19:57:08 UTC (rev 77396)
@@ -60,6 +60,15 @@
###############################################################################
+# If we're using a bundled zlib with a prefix defined, we need a definition
+# flag.
+# TODO - is there some target property we can use to pass this automatically?
+# Hammering it at high levels is almost certainly not the right approach...
+if (Z_PREFIX_STR)
+ add_definitions(-DZ_PREFIX)
+ add_definitions(-DZ_PREFIX_STR=${Z_PREFIX_STR})
+endif (Z_PREFIX_STR)
+
# Set a variable that will tell build logic in subdirectories that there is a
# parent build. This will in some cases disable attempts to define settings
# such as RPATH values that we need the parent build to manage.
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
