Revision: 77647
http://sourceforge.net/p/brlcad/code/77647
Author: starseeker
Date: 2020-10-24 21:40:46 +0000 (Sat, 24 Oct 2020)
Log Message:
-----------
Adjust COMPILE_DEFINITIONS, assign MSVC specific static name.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/regex/CMakeLists.txt
Modified: brlcad/branches/extbuild/src/other/ext/regex/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/regex/CMakeLists.txt 2020-10-24
21:39:55 UTC (rev 77646)
+++ brlcad/branches/extbuild/src/other/ext/regex/CMakeLists.txt 2020-10-24
21:40:46 UTC (rev 77647)
@@ -90,8 +90,7 @@
set_target_properties(regex PROPERTIES OUTPUT_NAME regex_brl)
set_target_properties(regex PROPERTIES VERSION 1.0.4 SOVERSION 1)
if (MSVC)
- set_property(TARGET regex APPEND PROPERTY COMPILE_DEFINITIONS
"REGEX_EXPORT_DLL")
- set_property(TARGET regex APPEND PROPERTY COMPILE_DEFINITIONS "BRLCAD_DLL")
+ set_property(TARGET regex APPEND PROPERTY COMPILE_DEFINITIONS
"REGEX_DLL_EXPORTS")
endif (MSVC)
install(TARGETS regex
RUNTIME DESTINATION ${BIN_DIR}
@@ -100,7 +99,11 @@
if (BUILD_STATIC_LIBS)
add_library(regex-static STATIC ${REGEX_SOURCES})
- set_target_properties(regex-static PROPERTIES OUTPUT_NAME "regex_brl")
+ if (MSVC)
+ set_target_properties(regex-static PROPERTIES OUTPUT_NAME
"regex_brl-static")
+ else (MSVC)
+ set_target_properties(regex-static PROPERTIES OUTPUT_NAME "regex_brl")
+ endif (MSVC)
install(TARGETS regex-static
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
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
