Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
libaec
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mathis Rosenhauer
libaec
Commits
0b3c721c
Unverified
Commit
0b3c721c
authored
3 years ago
by
Miloš Komarčević
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Change naming convention for MSVC static library (#20)
Better match for HDF5's legacy FindSZIP.cmake
parent
deaaefa5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/libaec-config.cmake.in
+2
-2
2 additions, 2 deletions
cmake/libaec-config.cmake.in
src/CMakeLists.txt
+2
-2
2 additions, 2 deletions
src/CMakeLists.txt
with
4 additions
and
4 deletions
cmake/libaec-config.cmake.in
+
2
−
2
View file @
0b3c721c
...
...
@@ -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")
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
2
−
2
View file @
0b3c721c
...
...
@@ -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>"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment