Revision: 77246
http://sourceforge.net/p/brlcad/code/77246
Author: starseeker
Date: 2020-09-26 19:02:26 +0000 (Sat, 26 Sep 2020)
Log Message:
-----------
Found a way to be less verbose about conditionally pointing builds to local
copies.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/other/libpng/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/src/other/libpng/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/libpng/CMakeLists.txt
2020-09-26 18:32:02 UTC (rev 77245)
+++ brlcad/branches/thirdparty_rework/src/other/libpng/CMakeLists.txt
2020-09-26 19:02:26 UTC (rev 77246)
@@ -18,17 +18,8 @@
# For conditions of distribution and use, see the disclaimer
# and license in png.h
-cmake_minimum_required(VERSION 3.1)
-cmake_policy(VERSION 3.1)
+cmake_minimum_required(VERSION 3.12)
-# Use new variable expansion policy.
-if (POLICY CMP0053)
- cmake_policy(SET CMP0053 NEW)
-endif(POLICY CMP0053)
-if (POLICY CMP0054)
- cmake_policy(SET CMP0054 NEW)
-endif(POLICY CMP0054)
-
set(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo")
project(libpng C)
@@ -591,7 +582,6 @@
endif()
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
- message("got here?????")
install(FILES ${libpng_public_hdrs} DESTINATION include)
install(FILES ${libpng_public_hdrs} DESTINATION include/${PNGLIB_NAME})
endif()
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-09-26 18:32:02 UTC (rev 77245)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-09-26 19:02:26 UTC (rev 77246)
@@ -282,28 +282,20 @@
endif (MSVC)
if (TARGET ZLIB_BLD)
- ExternalProject_Add(PNG_BLD
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../other/libpng"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DCMAKE_INSTALL_LIBDIR=${LIB_DIR}
- -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/${LIB_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
- -DPNG_STATIC=${BUILD_STATIC_LIBS} -DSKIP_INSTALL_FILES=ON
-DSKIP_INSTALL_EXECUTABLES=ON
- -DSKIP_INSTALL_EXPORT=ON -DPNG_TESTS=OFF
-Dld-version-script=OFF
- -DZLIB_ROOT=${CMAKE_BINARY_DIR}
-DZLIB_LIBRARY=$<TARGET_LINKER_FILE_DIR:zlib>/${ZLIB_BASENAME}$<TARGET_LINKER_FILE_SUFFIX:zlib>
- -DPNG_LIB_NAME=${PNG_LIB_NAME} -DPNG_PREFIX=brl_
- DEPENDS ${ZLIB_TARGET}
- )
- else (TARGET ZLIB_BLD)
- ExternalProject_Add(PNG_BLD
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libpng"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DCMAKE_INSTALL_LIBDIR=${LIB_DIR}
- -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/${LIB_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
- -DPNG_STATIC=${BUILD_STATIC_LIBS} -DSKIP_INSTALL_FILES=ON
-DSKIP_INSTALL_EXECUTABLES=ON
- -DSKIP_INSTALL_EXPORT=ON -DPNG_TESTS=OFF
-Dld-version-script=OFF
- -DPNG_PREFIX=brl_
- )
- endif (TARGET ZLIB_BLD)
+ set(ZLIB_TARGET ZLIB_BLD)
+ endif (TARGET ZLIB_BLD)
+
+ ExternalProject_Add(PNG_BLD
+ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../other/libpng"
+ BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DCMAKE_INSTALL_LIBDIR=${LIB_DIR}
+ -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/${LIB_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
+ -DPNG_STATIC=${BUILD_STATIC_LIBS} -DSKIP_INSTALL_FILES=ON
-DSKIP_INSTALL_EXECUTABLES=ON
+ -DSKIP_INSTALL_EXPORT=ON -DPNG_TESTS=OFF -Dld-version-script=OFF
+ -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}>
-DZLIB_LIBRARY=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
+ -DPNG_LIB_NAME=${PNG_LIB_NAME} -DPNG_PREFIX=brl_
+ DEPENDS ${ZLIB_TARGET}
+ )
ExternalProject_Target(png PNG_BLD
OUTPUT_FILE ${PNG_BASENAME}${PNG_SUFFIX}
STATIC_OUTPUT_FILE ${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -361,27 +353,18 @@
set(OPENNURBS_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${OPENNURBS_VERSION})
endif (MSVC)
- # Because we use a custom name for zlib, we need to conditionally use a
- # generator expression to set its location for FindZLIB. So far, haven't
- # found a less verbose way to make this work...
- if (TARGET zlib)
- ExternalProject_Add(OPENNURBS_BLD
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../other/openNURBS"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-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}
-DZLIB_LIBRARY=$<TARGET_LINKER_FILE_DIR:zlib>/${ZLIB_BASENAME}$<TARGET_LINKER_FILE_SUFFIX:zlib>
- DEPENDS ${ZLIB_TARGET}
- )
- else (TARGET zlib)
- ExternalProject_Add(OPENNURBS_BLD
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../other/openNURBS"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DLIB_DIR=${LIB_DIR} -DBIN_DIR=${BIN_DIR}
- -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
- )
- endif (TARGET zlib)
+ if (TARGET ZLIB_BLD)
+ set(ZLIB_TARGET ZLIB_BLD)
+ endif (TARGET ZLIB_BLD)
+ ExternalProject_Add(OPENNURBS_BLD
+ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../other/openNURBS"
+ BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
+ -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+ -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}>
-DZLIB_LIBRARY=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
+ DEPENDS ${ZLIB_TARGET}
+ )
ExternalProject_Target(openNURBS OPENNURBS_BLD
OUTPUT_FILE ${OPENNURBS_BASENAME}${OPENNURBS_SUFFIX}
STATIC_OUTPUT_FILE ${OPENNURBS_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
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
