From 0b3c721ca727060912272212a352077c88c30d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
<4973094+kmilos@users.noreply.github.com>
Date: Tue, 29 Jun 2021 15:52:45 +0200
Subject: [PATCH] Change naming convention for MSVC static library (#20)
Better match for HDF5's legacy FindSZIP.cmake
---
cmake/libaec-config.cmake.in | 4 ++--
src/CMakeLists.txt | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake/libaec-config.cmake.in b/cmake/libaec-config.cmake.in
index 2f733be..5054da8 100644
--- a/cmake/libaec-config.cmake.in
+++ b/cmake/libaec-config.cmake.in
@@ -28,8 +28,8 @@ find_path(libaec_INCLUDE_DIR NAMES libaec.h DOC "AEC include directory")
find_path(SZIP_INCLUDE_DIR NAMES szlib.h DOC "SZIP include directory")
if (libaec_USE_STATIC_LIBS)
if (MSVC)
- find_library(libaec_LIBRARY NAMES aec_static.lib DOC "AEC library")
- find_library(SZIP_LIBRARY NAMES szip_static.lib DOC "SZIP compatible version of the AEC library")
+ find_library(libaec_LIBRARY NAMES aec-static.lib DOC "AEC library")
+ find_library(SZIP_LIBRARY NAMES szip-static.lib DOC "SZIP compatible version of the AEC library")
else ()
find_library(libaec_LIBRARY NAMES libaec.a DOC "AEC library")
find_library(SZIP_LIBRARY NAMES libsz.a DOC "SZIP compatible version of the AEC library")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 87d3833..c634e68 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,7 @@ add_library(aec_static STATIC "$<TARGET_OBJECTS:aec>")
target_link_libraries(aec_static PUBLIC aec)
set_target_properties(aec_static
PROPERTIES
- OUTPUT_NAME $<IF:$<BOOL:${MSVC}>,aec_static,aec>)
+ OUTPUT_NAME $<IF:$<BOOL:${MSVC}>,aec-static,aec>)
add_library(aec_shared SHARED "$<TARGET_OBJECTS:aec>")
target_link_libraries(aec_shared PUBLIC aec)
@@ -34,7 +34,7 @@ target_link_libraries(sz PUBLIC aec)
add_library(sz_static STATIC "$<TARGET_OBJECTS:sz>" "$<TARGET_OBJECTS:aec>")
set_target_properties(sz_static
PROPERTIES
- OUTPUT_NAME $<IF:$<BOOL:${MSVC}>,szip_static,sz>)
+ OUTPUT_NAME $<IF:$<BOOL:${MSVC}>,szip-static,sz>)
target_link_libraries(sz_static PUBLIC sz)
add_library(sz_shared SHARED "$<TARGET_OBJECTS:sz>" "$<TARGET_OBJECTS:aec>")
--
GitLab