Revision: 77795
http://sourceforge.net/p/brlcad/code/77795
Author: starseeker
Date: 2020-11-21 20:30:02 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
See if we can adjust GDAL naming to match OpenBSD conventions...
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/gdal/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/gdal.cmake
Modified: brlcad/branches/extbuild/src/other/ext/gdal/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/gdal/CMakeLists.txt 2020-11-21
20:14:49 UTC (rev 77794)
+++ brlcad/branches/extbuild/src/other/ext/gdal/CMakeLists.txt 2020-11-21
20:30:02 UTC (rev 77795)
@@ -53,6 +53,12 @@
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
+# 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.*")
+
find_package(PROJ4 REQUIRED)
include_directories(
@@ -384,6 +390,9 @@
if(gdal_libs)
target_link_libraries(gdal ${gdal_libs})
endif(gdal_libs)
+ if (OPENBSD)
+ set_target_properties(gdal PROPERTIES VERSION 1.0)
+ endif (OPENBSD)
install(TARGETS gdal
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
Modified: brlcad/branches/extbuild/src/other/ext/gdal.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-11-21 20:14:49 UTC
(rev 77794)
+++ brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-11-21 20:30:02 UTC
(rev 77795)
@@ -14,14 +14,6 @@
if (BRLCAD_GDAL_BUILD)
- if (MSVC)
- set(GDAL_BASENAME gdal)
- set(GDAL_STATICNAME gdal-static)
- else (MSVC)
- set(GDAL_BASENAME libgdal)
- set(GDAL_STATICNAME libgdal)
- endif (MSVC)
-
set(GDAL_DEPS)
set(TARGET_LIST zlib png proj)
foreach(T ${TARGET_LIST})
@@ -38,7 +30,6 @@
set(PNG_TARGET PNG_BLD)
endif (TARGET PNG_BLD)
- set(GDAL_INSTDIR ${CMAKE_BINARY_INSTALL_ROOT}/gdal)
if (MSVC)
set(ZLIB_LIBRARY ${CMAKE_BINARY_ROOT}/${LIB_DIR}/${ZLIB_BASENAME}.lib)
@@ -51,6 +42,22 @@
set(PNG_LIBRARY
${CMAKE_BINARY_ROOT}/${LIB_DIR}/${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
endif (MSVC)
+ if (MSVC)
+ set(GDAL_BASENAME gdal)
+ set(GDAL_STATICNAME gdal-static)
+ set(GDAL_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ elseif (OPENBSD)
+ set(GDAL_BASENAME libgdal)
+ set(GDAL_STATICNAME libgdal)
+ set(GDAL_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.1.0)
+ else (MSVC)
+ set(GDAL_BASENAME libgdal)
+ set(GDAL_STATICNAME libgdal)
+ set(GDAL_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ endif (MSVC)
+
+ set(GDAL_INSTDIR ${CMAKE_BINARY_INSTALL_ROOT}/gdal)
+
ExternalProject_Add(GDAL_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gdal"
BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
@@ -72,7 +79,7 @@
# Tell the parent build about files and libraries
ExternalProject_Target(SHARED gdal GDAL_BLD ${GDAL_INSTDIR}
- ${GDAL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ ${GDAL_BASENAME}${GDAL_SUFFIX}
RPATH
)
if (BUILD_STATIC_LIBS)
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
