diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ebd0c6bce077b2154a60b00a424f967fd1b7f3c..68bb9bf0e71d82de003e29d64508cff13eaa448a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1656,7 +1656,7 @@ endif(WIN32 OR CYGWIN) # (e.g. "make lib" or "make shared" followed by "make install/fast") install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL) if(ENABLE_BUILD_LIB) - install(TARGETS lib DESTINATION ${GMSH_LIB} OPTIONAL) + install(TARGETS lib DESTINATION ${INSTALL_LIB_DIR} OPTIONAL) endif(ENABLE_BUILD_LIB) if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) if(WIN32 AND NOT MSVC OR CYGWIN) @@ -1692,7 +1692,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GCC_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB}) endif(GCC_DLL AND STDC_DLL) else(WIN32 AND NOT MSVC OR CYGWIN) - install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL) + install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL) endif(WIN32 AND NOT MSVC OR CYGWIN) endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) diff --git a/wrappers/java/CMakeLists.txt b/wrappers/java/CMakeLists.txt index 4c8fbc6380c715b1fd127edf9d2fd200cb23b3e4..4c21eb29ca0d134e2e3020471f3c4f3dad92644f 100644 --- a/wrappers/java/CMakeLists.txt +++ b/wrappers/java/CMakeLists.txt @@ -69,6 +69,6 @@ POST_BUILD # do the rest of the command after the build period COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/) -install(TARGETS WrapGmsh DESTINATION lib OPTIONAL) +install(TARGETS WrapGmsh DESTINATION ${INSTALL_LIB_DIR} OPTIONAL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar - DESTINATION lib) + DESTINATION ${INSTALL_LIB_DIR})