Revision: 77656
http://sourceforge.net/p/brlcad/code/77656
Author: starseeker
Date: 2020-10-28 12:35:48 +0000 (Wed, 28 Oct 2020)
Log Message:
-----------
Start working on updates for static libs on MSVC - need to avoid collisions
with dll import library filenames.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/gdal.cmake
brlcad/branches/extbuild/src/other/ext/netpbm.cmake
brlcad/branches/extbuild/src/other/ext/png.cmake
brlcad/branches/extbuild/src/other/ext/proj4.cmake
brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/zlib.cmake
Modified: brlcad/branches/extbuild/src/other/ext/gdal.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-10-28 06:51:30 UTC
(rev 77655)
+++ brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-10-28 12:35:48 UTC
(rev 77656)
@@ -16,8 +16,10 @@
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)
@@ -69,7 +71,7 @@
)
if (BUILD_STATIC_LIBS)
ExternalProject_Target(STATIC gdal-static GDAL_BLD ${GDAL_INSTDIR}
- ${GDAL_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ${GDAL_STATICNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
)
endif (BUILD_STATIC_LIBS)
Modified: brlcad/branches/extbuild/src/other/ext/netpbm.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/netpbm.cmake 2020-10-28 06:51:30 UTC
(rev 77655)
+++ brlcad/branches/extbuild/src/other/ext/netpbm.cmake 2020-10-28 12:35:48 UTC
(rev 77656)
@@ -15,8 +15,10 @@
if (MSVC)
set(NETPBM_BASENAME netpbm)
+ set(NETPBM_STATICNAME netpbm-static)
else (MSVC)
set(NETPBM_BASENAME libnetpbm)
+ set(NETPBM_STATICNAME libnetpbm)
endif (MSVC)
set(NETPBM_INSTDIR ${CMAKE_BINARY_INSTALL_ROOT}/netpbm)
@@ -37,7 +39,7 @@
)
if (BUILD_STATIC_LIBS)
ExternalProject_Target(STATIC netpbm-static NETPBM_BLD ${NETPBM_INSTDIR}
- ${NETPBM_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ${NETPBM_STATICNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
)
endif (BUILD_STATIC_LIBS)
Modified: brlcad/branches/extbuild/src/other/ext/png.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png.cmake 2020-10-28 06:51:30 UTC
(rev 77655)
+++ brlcad/branches/extbuild/src/other/ext/png.cmake 2020-10-28 12:35:48 UTC
(rev 77656)
@@ -29,9 +29,11 @@
if (MSVC)
set(PNG_BASENAME ${PNG_LIB_NAME})
+ set(PNG_STATICNAME ${PNG_LIB_NAME}-static)
set(PNG_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
else (MSVC)
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}.0)
endif (MSVC)
@@ -75,8 +77,8 @@
)
if (BUILD_STATIC_LIBS)
ExternalProject_Target(STATIC png-static PNG_BLD ${PNG_INSTDIR}
- ${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS ${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ${PNG_STATICNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ SYMLINKS ${PNG_STATICNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
)
endif (BUILD_STATIC_LIBS)
Modified: brlcad/branches/extbuild/src/other/ext/proj4.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-10-28 06:51:30 UTC
(rev 77655)
+++ brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-10-28 12:35:48 UTC
(rev 77656)
@@ -46,10 +46,6 @@
LINK_TARGET ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
- if (BUILD_STATIC_LIBS)
- ExternalProject_Target(STATIC proj-static PROJ4_BLD ${PROJ4_INSTDIR}
- ${PROJ_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- )
endif (BUILD_STATIC_LIBS)
ExternalProject_ByProducts(proj PROJ4_BLD ${PROJ4_INSTDIR} ${DATA_DIR}/proj
Modified: brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt 2020-10-28
06:51:30 UTC (rev 77655)
+++ brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt 2020-10-28
12:35:48 UTC (rev 77656)
@@ -162,7 +162,11 @@
if(BUILD_STATIC_LIBS)
add_library(zlib-static STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS}
${ZLIB_PRIVATE_HDRS})
- set_target_properties(zlib-static PROPERTIES OUTPUT_NAME z_brl)
+ if (NOT MSVC)
+ set_target_properties(zlib-static PROPERTIES OUTPUT_NAME z_brl)
+ else (NOT MSVC)
+ set_target_properties(zlib-static PROPERTIES OUTPUT_NAME z_brl_static)
+ endif (NOT MSVC)
if(CMAKE_CL_64)
set_target_properties(zlib-static PROPERTIES STATIC_LIBRARY_FLAGS
"/machine:x64")
elseif(MSVC)
Modified: brlcad/branches/extbuild/src/other/ext/zlib.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-10-28 06:51:30 UTC
(rev 77655)
+++ brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-10-28 12:35:48 UTC
(rev 77656)
@@ -22,9 +22,11 @@
if (MSVC)
set(ZLIB_BASENAME z_brl)
+ set(ZLIB_STATICNAME z_brl_static)
set(ZLIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
else (MSVC)
set(ZLIB_BASENAME libz_brl)
+ set(ZLIB_STATICNAME libz_brl)
set(ZLIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${ZLIB_VERSION})
endif (MSVC)
@@ -49,7 +51,7 @@
)
if (BUILD_STATIC_LIBS)
ExternalProject_Target(STATIC zlib-static ZLIB_BLD ${ZLIB_INSTDIR}
- ${ZLIB_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ${ZLIB_STATICNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
)
endif (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
