Revision: 77792
http://sourceforge.net/p/brlcad/code/77792
Author: starseeker
Date: 2020-11-21 20:01:48 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
Start working on png OpenBSD adjustments.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/gdal.cmake
brlcad/branches/extbuild/src/other/ext/png/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/png.cmake
Modified: brlcad/branches/extbuild/src/other/ext/gdal.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-11-21 18:19:23 UTC
(rev 77791)
+++ brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-11-21 20:01:48 UTC
(rev 77792)
@@ -43,6 +43,9 @@
if (MSVC)
set(ZLIB_LIBRARY ${CMAKE_BINARY_ROOT}/${LIB_DIR}/${ZLIB_BASENAME}.lib)
set(PNG_LIBRARY ${CMAKE_BINARY_ROOT}/${LIB_DIR}/${PNG_BASENAME}.lib)
+ elseif (OPENBSD)
+ set(ZLIB_LIBRARY
${CMAKE_BINARY_ROOT}/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1.2)
+ set(PNG_LIBRARY
${CMAKE_BINARY_ROOT}/${LIB_DIR}/${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1.6)
else (MSVC)
set(ZLIB_LIBRARY
${CMAKE_BINARY_ROOT}/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(PNG_LIBRARY
${CMAKE_BINARY_ROOT}/${LIB_DIR}/${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
Modified: brlcad/branches/extbuild/src/other/ext/png/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png/CMakeLists.txt 2020-11-21
18:19:23 UTC (rev 77791)
+++ brlcad/branches/extbuild/src/other/ext/png/CMakeLists.txt 2020-11-21
20:01:48 UTC (rev 77792)
@@ -30,12 +30,23 @@
project(libpng C)
enable_testing()
+# OpenBSD has its own naming conventions. Set a platform variable based on
+# the OS name so we can test for it succinctly.
+if ("${CMAKE_SYSTEM}" MATCHES ".*OpenBSD.*")
+ set(OPENBSD ON)
+endif ("${CMAKE_SYSTEM}" MATCHES ".*OpenBSD.*")
+
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 6)
set(PNGLIB_RELEASE 37)
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
-set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
+if(OPENBSD)
+ set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR})
+else(OPENBSD)
+ set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
+endif(OPENBSD)
+
# needed packages
if (Z_PREFIX)
add_definitions(-DZ_PREFIX)
@@ -544,11 +555,16 @@
# SET UP LINKS
if(PNG_SHARED)
- set_target_properties(png PROPERTIES
-# VERSION 16.${PNGLIB_RELEASE}.1.6.37
- VERSION 16.${PNGLIB_RELEASE}.0
- SOVERSION 16
- CLEAN_DIRECT_OUTPUT 1)
+ if(OPENBSD)
+ set_target_properties(png PROPERTIES
+ VERSION 1.6
+ CLEAN_DIRECT_OUTPUT 1)
+ else(OPENBSD)
+ set_target_properties(png PROPERTIES
+ VERSION 16.${PNGLIB_RELEASE}.0
+ SOVERSION 16
+ CLEAN_DIRECT_OUTPUT 1)
+ endif(OPENBSD)
endif()
# INSTALL
@@ -560,7 +576,7 @@
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
- if(PNG_SHARED)
+ if(PNG_SHARED AND NOT OPENBSD)
# Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
if(CYGWIN OR MINGW)
create_symlink(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png)
@@ -575,7 +591,7 @@
endif()
endif()
- if(PNG_STATIC)
+ if(PNG_STATIC AND NOT OPENBSD)
if(NOT WIN32 OR CYGWIN OR MINGW)
create_symlink(libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
install(FILES
$<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
Modified: brlcad/branches/extbuild/src/other/ext/png.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png.cmake 2020-11-21 18:19:23 UTC
(rev 77791)
+++ brlcad/branches/extbuild/src/other/ext/png.cmake 2020-11-21 20:01:48 UTC
(rev 77792)
@@ -39,6 +39,10 @@
set(PNG_SUFFIX
.${PNG_VERSION_MAJOR}.${PNG_VERSION_MINOR}.0${CMAKE_SHARED_LIBRARY_SUFFIX})
set(PNG_SYMLINK_1 ${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(PNG_SYMLINK_2
${PNG_BASENAME}.${PNG_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ elseif (OPENBSD)
+ set(PNG_BASENAME lib${PNG_LIB_NAME})
+ set(PNG_STATICNAME lib${PNG_LIB_NAME})
+ set(PNG_SUFFIX
${CMAKE_SHARED_LIBRARY_SUFFIX}.${PNG_VERSION_MAJOR}.${PNG_VERSION_MINOR})
else (MSVC)
set(PNG_BASENAME lib${PNG_LIB_NAME})
set(PNG_STATICNAME lib${PNG_LIB_NAME})
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
