Revision: 77393
http://sourceforge.net/p/brlcad/code/77393
Author: starseeker
Date: 2020-10-09 19:27:35 +0000 (Fri, 09 Oct 2020)
Log Message:
-----------
Spoof FindPNG.cmake - since we're back to a non-superbuild setup (will need to
rename things accordingly) we're back to needing to satisfy the Find packages
with the imported targets. Need to systematically review once things stablize
a bit.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/png.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/png.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-10-09
19:23:20 UTC (rev 77392)
+++ brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-10-09
19:27:35 UTC (rev 77393)
@@ -71,8 +71,11 @@
libpng${PNG_VERSION_MAJOR}/pnglibconf.h
)
+ set(PNG_LIBRARY_DEBUG png CACHE STRING "Building bundled libpng" FORCE)
+ set(PNG_LIBRARY_RELEASE png CACHE STRING "Building bundled libpng" FORCE)
set(PNG_LIBRARIES png CACHE STRING "Building bundled libpng" FORCE)
- set(PNG_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INCLUDE_DIR}" CACHE STRING
"Directory containing libpng headers." FORCE)
+ set(PNG_PNG_INCLUDE_DIR "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing libpng headers." FORCE)
+ set(PNG_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing libpng headers." FORCE)
SetTargetFolder(PNG_BLD "Third Party Libraries")
SetTargetFolder(png "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
