Revision: 77379
http://sourceforge.net/p/brlcad/code/77379
Author: starseeker
Date: 2020-10-09 13:29:51 +0000 (Fri, 09 Oct 2020)
Log Message:
-----------
Make some adjustments to get png using local zlibd definitions (we're not
getting the zlib prefixes through add_subdirectory any more, so we have to
teach the png build itself how to add them).
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
brlcad/branches/thirdparty_rework/src/superbuild/png/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/png.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-09
13:17:05 UTC (rev 77378)
+++ brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-09
13:29:51 UTC (rev 77379)
@@ -23,6 +23,14 @@
endif (TARGET ${T}_stage)
endforeach(T ${TARGET_LIST})
+ if (TARGET ZLIB_BLD)
+ set(ZLIB_TARGET ZLIB_BLD)
+ endif (TARGET ZLIB_BLD)
+
+ if (TARGET PNG_BLD)
+ set(PNG_TARGET PNG_BLD)
+ endif (TARGET PNG_BLD)
+
set(GDAL_INSTDIR ${CMAKE_BINARY_DIR}/gdal)
ExternalProject_Add(GDAL_BLD
@@ -31,7 +39,9 @@
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${GDAL_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DZLIB_ROOT=${CMAKE_BINARY_DIR}/$<CONFIG>
+
-DZLIB_LIBRARY=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
-DPNG_ROOT=${CMAKE_BINARY_DIR}/$<CONFIG>
+
-DPNG_LIBRARY=$<$<BOOL:${PNG_TARGET}>:${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
-DPROJ4_ROOT=${CMAKE_BINARY_DIR}/$<CONFIG>
-DGDAL_INST_DATA_DIR=${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/gdal
DEPENDS ${GDAL_DEPS}
@@ -46,7 +56,7 @@
set(GDAL_EXECUTABLES gdalinfo gdallocationinfo gdal_translate gdaltransform
gdaldem gdalwarp gdalbuildvrt)
foreach(GDALEXEC ${GDAL_EXECUTABLES})
ExternalProject_Target(${GDALEXEC}_exe GDAL_BLD ${GDAL_INSTDIR}
- EXEC ${GDALEXEC}${CMAKE_EXECUTABLE_SUFFIX}
+ EXEC ${BIN_DIR}/${GDALEXEC}${CMAKE_EXECUTABLE_SUFFIX}
RPATH
)
endforeach(GDALEXEC ${GDAL_EXECUTABLES})
Modified: brlcad/branches/thirdparty_rework/src/superbuild/png/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/png/CMakeLists.txt
2020-10-09 13:17:05 UTC (rev 77378)
+++ brlcad/branches/thirdparty_rework/src/superbuild/png/CMakeLists.txt
2020-10-09 13:29:51 UTC (rev 77379)
@@ -20,8 +20,6 @@
cmake_minimum_required(VERSION 3.12)
-#set(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo")
-
project(libpng C)
enable_testing()
@@ -32,9 +30,16 @@
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
# needed packages
- find_package(ZLIB REQUIRED)
- include_directories(${ZLIB_INCLUDE_DIRS})
+if (Z_PREFIX)
+ add_definitions(-DZ_PREFIX)
+endif (Z_PREFIX)
+if (Z_PREFIX_STR)
+ add_definitions(-DZ_PREFIX_STR=${Z_PREFIX_STR})
+endif (Z_PREFIX_STR)
+find_package(ZLIB REQUIRED)
+include_directories(${ZLIB_INCLUDE_DIRS})
+
if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
find_library(M_LIBRARY m)
else()
Modified: brlcad/branches/thirdparty_rework/src/superbuild/png.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-10-09
13:17:05 UTC (rev 77378)
+++ brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-10-09
13:29:51 UTC (rev 77379)
@@ -45,7 +45,10 @@
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DSKIP_INSTALL_EXPORT=ON
-DPNG_STATIC=${BUILD_STATIC_LIBS} -DSKIP_INSTALL_EXECUTABLES=ON
-DSKIP_INSTALL_FILES=ON
-DSKIP_INSTALL_EXPORT=ON -DPNG_TESTS=OFF -Dld-version-script=OFF
-
-DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}/$<CONFIG>>
-DZLIB_LIBRARY=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
+
-DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}/$<CONFIG>>
+
-DZLIB_LIBRARY=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
+ $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
+ $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-DPNG_LIB_NAME=${PNG_LIB_NAME} -DPNG_PREFIX=brl_
DEPENDS ${PNG_DEPS}
)
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
