Skip to content
Snippets Groups Projects
Commit 0e03b288 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix install target for non-windows

parent d1860b12
No related branches found
No related tags found
No related merge requests found
...@@ -1286,8 +1286,10 @@ if(ENABLE_BUILD_LIB) ...@@ -1286,8 +1286,10 @@ if(ENABLE_BUILD_LIB)
install(TARGETS lib DESTINATION ${GMSH_LIB} OPTIONAL) install(TARGETS lib DESTINATION ${GMSH_LIB} OPTIONAL)
endif(ENABLE_BUILD_LIB) endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
install(TARGETS shared RUNTIME DESTINATION ${GMSH_LIB} OPTIONAL)
if(WIN32 AND NOT MSVC OR CYGWIN) if(WIN32 AND NOT MSVC OR CYGWIN)
# install only the runtime (DLL); the .dll.a generated by gcc is not usable
# by MSVC
install(TARGETS shared RUNTIME DESTINATION ${GMSH_LIB} OPTIONAL)
# install .def file # install .def file
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIBGMSH_DEF} install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIBGMSH_DEF}
DESTINATION ${GMSH_LIB}) DESTINATION ${GMSH_LIB})
...@@ -1299,6 +1301,8 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) ...@@ -1299,6 +1301,8 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
message(STATUS "Will install extra DLLs for Windows") message(STATUS "Will install extra DLLs for Windows")
install(FILES ${GCC_DLL} ${GFORTRAN_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB}) install(FILES ${GCC_DLL} ${GFORTRAN_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
endif(GCC_DLL AND GFORTRAN_DLL AND STDC_DLL) endif(GCC_DLL AND GFORTRAN_DLL AND STDC_DLL)
else(WIN32 AND NOT MSVC OR CYGWIN)
install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
endif(WIN32 AND NOT MSVC OR CYGWIN) endif(WIN32 AND NOT MSVC OR CYGWIN)
endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment