Skip to content

Commit 6bd379a

Browse files
Always install DLL import libraries
1 parent 6b03299 commit 6bd379a

1 file changed

Lines changed: 7 additions & 18 deletions

File tree

src/CMakeLists.txt

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -249,24 +249,13 @@ endif (WITH_PYTHON_WRAPPING)
249249
# Install FesapiCpp library
250250
# ============================================================================
251251

252-
# Only install include directory if we target CPP
253-
if (NOT WITH_PYTHON_WRAPPING AND NOT WITH_DOTNET_WRAPPING AND NOT WITH_JAVA_WRAPPING)
254-
INSTALL (
255-
TARGETS ${CPP_LIBRARY_NAME}
256-
EXPORT FESAPI_TARGETS
257-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
258-
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
259-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
260-
)
261-
else ()
262-
# Do not install DLL import libraries (on all Windows-based systems including Cygwin; they have extension .lib, in contrast to the .dll libraries that go to RUNTIME)
263-
INSTALL (
264-
TARGETS ${CPP_LIBRARY_NAME}
265-
EXPORT FESAPI_TARGETS
266-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
267-
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
268-
)
269-
endif (NOT WITH_PYTHON_WRAPPING AND NOT WITH_DOTNET_WRAPPING AND NOT WITH_JAVA_WRAPPING)
252+
INSTALL (
253+
TARGETS ${CPP_LIBRARY_NAME}
254+
EXPORT FESAPI_TARGETS
255+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
256+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
257+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
258+
)
270259

271260
INSTALL (
272261
EXPORT FESAPI_TARGETS

0 commit comments

Comments
 (0)