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

lib dir

parent 2df52aab
Branches
Tags
No related merge requests found
...@@ -1238,10 +1238,12 @@ endmacro(unix2dos) ...@@ -1238,10 +1238,12 @@ endmacro(unix2dos)
if(WIN32 OR CYGWIN) if(WIN32 OR CYGWIN)
if(ENABLE_OS_SPECIFIC_INSTALL) if(ENABLE_OS_SPECIFIC_INSTALL)
set(GMSH_BIN .) set(GMSH_BIN .)
set(GMSH_LIB .)
set(GMSH_DOC .) set(GMSH_DOC .)
set(GMSH_MAN .) set(GMSH_MAN .)
else(ENABLE_OS_SPECIFIC_INSTALL) else(ENABLE_OS_SPECIFIC_INSTALL)
set(GMSH_BIN bin) set(GMSH_BIN bin)
set(GMSH_LIB lib)
set(GMSH_DOC share/doc/gmsh) set(GMSH_DOC share/doc/gmsh)
set(GMSH_MAN share/man/man1) set(GMSH_MAN share/man/man1)
endif(ENABLE_OS_SPECIFIC_INSTALL) endif(ENABLE_OS_SPECIFIC_INSTALL)
...@@ -1257,10 +1259,12 @@ elseif(APPLE AND ENABLE_OS_SPECIFIC_INSTALL) ...@@ -1257,10 +1259,12 @@ elseif(APPLE AND ENABLE_OS_SPECIFIC_INSTALL)
# set these so that the files get installed nicely in the MacOSX # set these so that the files get installed nicely in the MacOSX
# .app bundle # .app bundle
set(GMSH_BIN ../MacOS) set(GMSH_BIN ../MacOS)
set(GMSH_LIB ../MacOS)
set(GMSH_DOC ../../..) set(GMSH_DOC ../../..)
set(GMSH_MAN ../../..) set(GMSH_MAN ../../..)
else(WIN32 OR CYGWIN) else(WIN32 OR CYGWIN)
set(GMSH_BIN bin) set(GMSH_BIN bin)
set(GMSH_LIB lib)
set(GMSH_DOC share/doc/gmsh) set(GMSH_DOC share/doc/gmsh)
set(GMSH_MAN share/man/man1) set(GMSH_MAN share/man/man1)
endif(WIN32 OR CYGWIN) endif(WIN32 OR CYGWIN)
...@@ -1269,10 +1273,10 @@ endif(WIN32 OR CYGWIN) ...@@ -1269,10 +1273,10 @@ endif(WIN32 OR CYGWIN)
# (e.g. "make lib" or "make shared" followed by "make install/fast") # (e.g. "make lib" or "make shared" followed by "make install/fast")
install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL) install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
if(ENABLE_BUILD_LIB) if(ENABLE_BUILD_LIB)
install(TARGETS lib DESTINATION 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 DESTINATION lib OPTIONAL) install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN}) install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment