Revision: 77649
http://sourceforge.net/p/brlcad/code/77649
Author: starseeker
Date: 2020-10-24 21:43:09 +0000 (Sat, 24 Oct 2020)
Log Message:
-----------
Setup for testing of regex MSVC specific static lib name to avoid .lib naming
conflict.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/regex.cmake
Modified: brlcad/branches/extbuild/src/other/ext/regex.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-10-24 21:41:41 UTC
(rev 77648)
+++ brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-10-24 21:43:09 UTC
(rev 77649)
@@ -16,9 +16,11 @@
set(REGEX_VERSION "1.0.4")
if (MSVC)
set(REGEX_BASENAME regex_brl)
+ set(REGEX_STATICNAME regex_brl-static)
set(REGEX_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
else (MSVC)
set(REGEX_BASENAME libregex_brl)
+ set(REGEX_STATICNAME libregex_brl)
set(REGEX_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${REGEX_VERSION})
endif (MSVC)
@@ -46,7 +48,7 @@
)
if (BUILD_STATIC_LIBS)
ExternalProject_Target(STATIC regex-static REGEX_BLD ${REGEX_INSTDIR}
- ${REGEX_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ${REGEX_STATICNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
RPATH
)
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
