Revision: 77835
http://sourceforge.net/p/brlcad/code/77835
Author: starseeker
Date: 2020-11-30 18:48:47 +0000 (Mon, 30 Nov 2020)
Log Message:
-----------
proj versioning is quirky
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/proj4.cmake
Modified: brlcad/branches/extbuild/src/other/ext/proj4.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-11-30 18:45:59 UTC
(rev 77834)
+++ brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-11-30 18:48:47 UTC
(rev 77835)
@@ -19,7 +19,25 @@
set(PROJ_API_VERSION 12)
set(PROJ_VERSION
${PROJ_MAJOR_VERSION}.${PROJ_MINOR_VERSION}.${PROJ_API_VERSION})
- set_lib_vars(PROJ proj "4" "9" "12")
+ if (MSVC)
+ set(PROJ_BASENAME proj)
+ set(PROJ_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PROJ_SYMLINK_1 ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PROJ_SYMLINK_2
${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_API_VERSION})
+ elseif (APPLE)
+ set(PROJ_BASENAME libproj)
+ set(PROJ_SUFFIX .${PROJ_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PROJ_SYMLINK_1 ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PROJ_SYMLINK_2
${PROJ_BASENAME}.${PROJ_API_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ elseif (OPENBSD)
+ set(PROJ_BASENAME libproj)
+ set(PROJ_SUFFIX
${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_MAJOR_VERSION}.${PROJ_MINOR_VERSION})
+ else (MSVC)
+ set(PROJ_BASENAME libproj)
+ set(PROJ_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_VERSION})
+ set(PROJ_SYMLINK_1 ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PROJ_SYMLINK_2
${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_API_VERSION})
+ endif (MSVC)
set(PROJ4_INSTDIR ${CMAKE_BINARY_INSTALL_ROOT}/proj-4)
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
