Revision: 75318
http://sourceforge.net/p/brlcad/code/75318
Author: starseeker
Date: 2020-04-09 15:29:03 +0000 (Thu, 09 Apr 2020)
Log Message:
-----------
Use a convenient CMake property to adjust the output names of the bundled
versions of libraries that are most likely to conflict with system versions.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
brlcad/trunk/src/other/libpng/CMakeLists.txt
brlcad/trunk/src/other/libregex/CMakeLists.txt
brlcad/trunk/src/other/libz/CMakeLists.txt
brlcad/trunk/src/other/lz4/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-04-09 15:27:40 UTC (rev
75317)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-04-09 15:29:03 UTC (rev
75318)
@@ -168,6 +168,7 @@
mark_as_advanced(DFA_XTRA)
mark_as_advanced(AWK)
set(CMAKE_INSTALL_LIBDIR ${LIB_DIR})
+set(PNG_LIB_NAME png_brl)
set(png_DESCRIPTION "
Option for enabling and disabling compilation of the Portable Network
Graphics library provided with BRL-CAD's source distribution. Default
Modified: brlcad/trunk/src/other/libpng/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libpng/CMakeLists.txt 2020-04-09 15:27:40 UTC
(rev 75317)
+++ brlcad/trunk/src/other/libpng/CMakeLists.txt 2020-04-09 15:29:03 UTC
(rev 75318)
@@ -65,7 +65,9 @@
set(DFA_XTRA "" CACHE FILEPATH "File containing extra configuration settings")
# SET LIBNAME
-set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
+if (NOT DEFINED PNG_LIB_NAME)
+ set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
+endif (NOT DEFINED PNG_LIB_NAME)
# to distinguish between debug and release lib
set(CMAKE_DEBUG_POSTFIX "d")
@@ -589,6 +591,7 @@
endif()
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
+ message("got here?????")
install(FILES ${libpng_public_hdrs} DESTINATION include)
install(FILES ${libpng_public_hdrs} DESTINATION include/${PNGLIB_NAME})
endif()
Modified: brlcad/trunk/src/other/libregex/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libregex/CMakeLists.txt 2020-04-09 15:27:40 UTC
(rev 75317)
+++ brlcad/trunk/src/other/libregex/CMakeLists.txt 2020-04-09 15:29:03 UTC
(rev 75318)
@@ -45,26 +45,26 @@
)
if (NOT DEFINED BIN_DIR)
- set (BIN_DIR bin)
+ set(BIN_DIR bin)
endif (NOT DEFINED BIN_DIR)
if (NOT DEFINED LIB_DIR)
- set (LIB_DIR lib)
+ set(LIB_DIR lib)
endif (NOT DEFINED LIB_DIR)
if (NOT DEFINED INCLUDE_DIR)
- set (INCLUDE_DIR include)
+ set(INCLUDE_DIR include)
endif (NOT DEFINED INCLUDE_DIR)
-option (ENABLE_REGEX_PREFIX "Add regex_ prefix to all library functions." OFF)
+option(ENABLE_REGEX_PREFIX "Add regex_ prefix to all library functions." OFF)
if (DEFINED REGEX_PREFIX_STR)
- set (ENABLE_REGEX_PREFIX ON CACHE BOOL "Ensure prefix is set" FORCE)
+ set(ENABLE_REGEX_PREFIX ON CACHE BOOL "Ensure prefix is set" FORCE)
endif (DEFINED REGEX_PREFIX_STR)
if (ENABLE_REGEX_PREFIX)
set(REGEX_PREFIX 1)
endif (ENABLE_REGEX_PREFIX)
-mark_as_advanced (ENABLE_REGEX_PREFIX)
-mark_as_advanced (REGEX_PREFIX_STR)
+mark_as_advanced(ENABLE_REGEX_PREFIX)
+mark_as_advanced(REGEX_PREFIX_STR)
configure_file(regex.h.in ${CMAKE_CURRENT_BINARY_DIR}/regex.h @ONLY)
@@ -79,34 +79,34 @@
regfree.c
)
-add_library (regex SHARED ${REGEX_SOURCES})
-set_target_properties (regex PROPERTIES VERSION 1.0.4 SOVERSION 1)
+add_library(regex SHARED ${REGEX_SOURCES})
+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_EXPORT_DLL")
+ set_property(TARGET regex APPEND PROPERTY COMPILE_DEFINITIONS "BRLCAD_DLL")
endif (MSVC)
-install (TARGETS regex
+install(TARGETS regex
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR})
if (BUILD_STATIC_LIBS)
- add_library (regex-static STATIC ${REGEX_SOURCES})
+ add_library(regex-static STATIC ${REGEX_SOURCES})
+ set_target_properties(regex-static PROPERTIES OUTPUT_NAME "regex_brl")
if (MSVC)
# msvc does not append 'lib' - do it here to have consistent name
set_target_properties(regex-static PROPERTIES PREFIX "lib")
- else (MSVC)
- set_target_properties(regex-static PROPERTIES OUTPUT_NAME "regex")
endif (MSVC)
- install (TARGETS regex-static
+ install(TARGETS regex-static
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR})
endif (BUILD_STATIC_LIBS)
-if (NOT SKIP_INSTALL_HDRS)
- install (FILES ${REGEX_HDRS} DESTINATION ${INCLUDE_DIR})
-endif (NOT SKIP_INSTALL_HDRS)
+if (NOT SKIP_INSTALL_HEADERS)
+ install(FILES ${REGEX_HDRS} DESTINATION ${INCLUDE_DIR})
+endif (NOT SKIP_INSTALL_HEADERS)
# Local Variables:
Modified: brlcad/trunk/src/other/libz/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libz/CMakeLists.txt 2020-04-09 15:27:40 UTC (rev
75317)
+++ brlcad/trunk/src/other/libz/CMakeLists.txt 2020-04-09 15:29:03 UTC (rev
75318)
@@ -151,9 +151,11 @@
endif(MINGW)
add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS}
${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+set_target_properties(zlib PROPERTIES OUTPUT_NAME z_brl)
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(MSVC)
# msvc does not append 'lib' - do it here to have consistent name
set_target_properties(zlib-static PROPERTIES PREFIX "lib")
@@ -181,9 +183,6 @@
if(UNIX)
# On unix-like platforms the library is almost always called libz
- if(BUILD_STATIC_LIBS)
- set_target_properties(zlib zlib-static PROPERTIES OUTPUT_NAME z)
- endif(BUILD_STATIC_LIBS)
if(NOT APPLE AND BUILD_SHARED_LIBS)
set_target_properties(zlib PROPERTIES LINK_FLAGS
"-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
endif()
Modified: brlcad/trunk/src/other/lz4/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/lz4/CMakeLists.txt 2020-04-09 15:27:40 UTC (rev
75317)
+++ brlcad/trunk/src/other/lz4/CMakeLists.txt 2020-04-09 15:29:03 UTC (rev
75318)
@@ -87,6 +87,7 @@
if(BUILD_SHARED_LIBS)
add_library(lz4 SHARED ${LZ4_SRCS})
+ set_target_properties(lz4 PROPERTIES OUTPUT_NAME lz4_brl)
install(TARGETS lz4
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
@@ -103,11 +104,10 @@
if(BUILD_STATIC_LIBS)
add_library(lz4-static STATIC ${LZ4_SRCS})
+ set_target_properties(lz4-static PROPERTIES OUTPUT_NAME "lz4_brl")
if(MSVC)
# msvc does not append 'lib' - do it here to have consistent name
set_target_properties(lz4-static PROPERTIES PREFIX "lib")
- else(MSVC)
- set_target_properties(lz4-static PROPERTIES OUTPUT_NAME "lz4")
endif(MSVC)
install(TARGETS lz4-static
RUNTIME DESTINATION ${BIN_DIR}
@@ -115,7 +115,9 @@
ARCHIVE DESTINATION ${LIB_DIR})
endif(BUILD_STATIC_LIBS)
-install(FILES ${LZ4_HDRS} DESTINATION ${INCLUDE_DIR})
+if (NOT SKIP_INSTALL_HEADERS)
+ install(FILES ${LZ4_HDRS} DESTINATION ${INCLUDE_DIR})
+endif (NOT SKIP_INSTALL_HEADERS)
# Local Variables:
# tab-width: 8
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
