Revision: 77498
http://sourceforge.net/p/brlcad/code/77498
Author: starseeker
Date: 2020-10-19 15:11:13 +0000 (Mon, 19 Oct 2020)
Log Message:
-----------
See if not prefixing can make things more consistent/simpler
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/gdal/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/netpbm/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/png/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/proj-4/src/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/regex/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/zlib/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/zlib.dist
Modified: brlcad/branches/thirdparty_rework/src/superbuild/gdal/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/gdal/CMakeLists.txt
2020-10-19 14:34:35 UTC (rev 77497)
+++ brlcad/branches/thirdparty_rework/src/superbuild/gdal/CMakeLists.txt
2020-10-19 15:11:13 UTC (rev 77498)
@@ -384,12 +384,9 @@
if (BUILD_STATIC_LIBS)
add_library(gdal-static STATIC ${gdal_srcs})
- if (MSVC)
- # msvc does not append 'lib' - do it here to have consistent name
- set_target_properties(gdal-static PROPERTIES PREFIX "lib")
- else (MSVC)
+ if (NOT MSVC)
set_target_properties(gdal-static PROPERTIES OUTPUT_NAME "gdal")
- endif (MSVC)
+ endif (NOT MSVC)
install(TARGETS gdal-static
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/netpbm/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/netpbm/CMakeLists.txt
2020-10-19 14:34:35 UTC (rev 77497)
+++ brlcad/branches/thirdparty_rework/src/superbuild/netpbm/CMakeLists.txt
2020-10-19 15:11:13 UTC (rev 77498)
@@ -154,20 +154,14 @@
endif (BUILD_SHARED_LIBS)
if(MSVC)
- # msvc does not append 'lib' - do it here to have consistent name
- set_target_properties(netpbm PROPERTIES PREFIX "lib")
- set_target_properties(netpbm PROPERTIES IMPORT_PREFIX "lib")
set_property(TARGET netpbm APPEND PROPERTY COMPILE_DEFINITIONS
"NETPBM_DLL_EXPORTS")
endif(MSVC)
if (BUILD_STATIC_LIBS)
add_library(netpbm-static STATIC ${NETPBM_SRCS})
- if (MSVC)
- # msvc does not append 'lib' - do it here to have consistent name
- set_target_properties(netpbm-static PROPERTIES PREFIX "lib")
- else (MSVC)
+ if (NOT MSVC)
set_target_properties(netpbm-static PROPERTIES OUTPUT_NAME "netpbm")
- endif (MSVC)
+ endif (NOT MSVC)
install(TARGETS netpbm-static
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/png/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/png/CMakeLists.txt
2020-10-19 14:34:35 UTC (rev 77497)
+++ brlcad/branches/thirdparty_rework/src/superbuild/png/CMakeLists.txt
2020-10-19 15:11:13 UTC (rev 77498)
@@ -370,11 +370,6 @@
set(PNG_LIB_TARGETS png)
set_target_properties(png PROPERTIES OUTPUT_NAME ${PNG_LIB_NAME})
add_dependencies(png genfiles)
- if(MSVC)
- # msvc does not append 'lib' - do it here to have consistent name
- set_target_properties(png PROPERTIES PREFIX "lib")
- set_target_properties(png PROPERTIES IMPORT_PREFIX "lib")
- endif()
target_link_libraries(png ${ZLIB_LIBRARIES} ${M_LIBRARY})
if(UNIX AND AWK)
@@ -406,10 +401,6 @@
CLEAN_DIRECT_OUTPUT 1)
endif()
list(APPEND PNG_LIB_TARGETS png_static)
- if(MSVC)
- # msvc does not append 'lib' - do it here to have consistent name
- set_target_properties(png_static PROPERTIES PREFIX "lib")
- endif()
target_link_libraries(png_static ${ZLIB_LIBRARIES} ${M_LIBRARY})
endif()
Modified:
brlcad/branches/thirdparty_rework/src/superbuild/proj-4/src/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/proj-4/src/CMakeLists.txt
2020-10-19 14:34:35 UTC (rev 77497)
+++ brlcad/branches/thirdparty_rework/src/superbuild/proj-4/src/CMakeLists.txt
2020-10-19 15:11:13 UTC (rev 77498)
@@ -217,12 +217,9 @@
if (BUILD_STATIC_LIBS)
add_library(proj-static STATIC ${all_srcs} ${hdr_files})
- if (MSVC)
- # msvc does not append 'lib' - do it here to have consistent name
- set_target_properties(proj-static PROPERTIES PREFIX "lib")
- else (MSVC)
+ if (NOT MSVC)
set_target_properties(proj-static PROPERTIES OUTPUT_NAME "proj")
- endif (MSVC)
+ endif (NOT MSVC)
install(TARGETS proj-static
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/regex/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/regex/CMakeLists.txt
2020-10-19 14:34:35 UTC (rev 77497)
+++ brlcad/branches/thirdparty_rework/src/superbuild/regex/CMakeLists.txt
2020-10-19 15:11:13 UTC (rev 77498)
@@ -94,10 +94,6 @@
if (BUILD_STATIC_LIBS)
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")
- endif (MSVC)
install(TARGETS regex-static
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/zlib/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/zlib/CMakeLists.txt
2020-10-19 14:34:35 UTC (rev 77497)
+++ brlcad/branches/thirdparty_rework/src/superbuild/zlib/CMakeLists.txt
2020-10-19 15:11:13 UTC (rev 77498)
@@ -156,10 +156,6 @@
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")
- endif(MSVC)
if(CMAKE_CL_64)
set_target_properties(zlib-static PROPERTIES STATIC_LIBRARY_FLAGS
"/machine:x64")
elseif(MSVC)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/zlib.dist
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/zlib.dist 2020-10-19
14:34:35 UTC (rev 77497)
+++ brlcad/branches/thirdparty_rework/src/superbuild/zlib.dist 2020-10-19
15:11:13 UTC (rev 77498)
@@ -26,7 +26,6 @@
win32/zlib1.rc
zconf.h.in
zlib.h.in
-zlib.map
zutil.c
zutil.h
)
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
