Revision: 77855
http://sourceforge.net/p/brlcad/code/77855
Author: starseeker
Date: 2020-12-01 22:38:32 +0000 (Tue, 01 Dec 2020)
Log Message:
-----------
Use - instead of _ for the static suffix. Need to check - if there's a
convention to use _ instead, should do so uniformly.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/png/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt
Modified: brlcad/branches/extbuild/src/other/ext/png/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png/CMakeLists.txt 2020-12-01
19:55:36 UTC (rev 77854)
+++ brlcad/branches/extbuild/src/other/ext/png/CMakeLists.txt 2020-12-01
22:38:32 UTC (rev 77855)
@@ -403,23 +403,23 @@
if(PNG_STATIC)
# does not work without changing name
- set(PNG_LIB_NAME_STATIC png_static)
- add_library(png_static STATIC ${libpng_sources})
- add_dependencies(png_static genfiles)
+ set(PNG_LIB_NAME_STATIC png-static)
+ add_library(png-static STATIC ${libpng_sources})
+ add_dependencies(png-static genfiles)
# MSVC doesn't use a different file extension for shared vs. static
- # libs. We are able to change OUTPUT_NAME to remove the _static
+ # libs. We are able to change OUTPUT_NAME to remove the -static
# for all other platforms.
if(NOT MSVC)
- set_target_properties(png_static PROPERTIES
+ set_target_properties(png-static PROPERTIES
OUTPUT_NAME "${PNG_LIB_NAME}"
CLEAN_DIRECT_OUTPUT 1)
else()
- set_target_properties(png_static PROPERTIES
- OUTPUT_NAME "${PNG_LIB_NAME}_static"
+ set_target_properties(png-static PROPERTIES
+ OUTPUT_NAME "${PNG_LIB_NAME}-static"
CLEAN_DIRECT_OUTPUT 1)
endif()
- list(APPEND PNG_LIB_TARGETS png_static)
- target_link_libraries(png_static ${ZLIB_LIBRARIES} ${M_LIBRARY})
+ list(APPEND PNG_LIB_TARGETS png-static)
+ target_link_libraries(png-static ${ZLIB_LIBRARIES} ${M_LIBRARY})
endif()
if(PNG_FRAMEWORK)
@@ -593,8 +593,8 @@
if(PNG_STATIC AND NOT OPENBSD)
if(NOT WIN32 OR CYGWIN OR MINGW)
- create_symlink(libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
- install(FILES
$<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
+ create_symlink(libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png-static)
+ install(FILES
$<TARGET_LINKER_FILE_DIR:png-static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
endif()
Modified: brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt 2020-12-01
19:55:36 UTC (rev 77854)
+++ brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt 2020-12-01
22:38:32 UTC (rev 77855)
@@ -165,7 +165,7 @@
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)
+ 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")
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
