diff --git a/wrappers/java/CMakeLists.txt b/wrappers/java/CMakeLists.txt
index 0a12414a89554db17d27648b71fc07a3f1b741c7..7cb0c09678abd301e29845fb49f06349f6797286 100644
--- a/wrappers/java/CMakeLists.txt
+++ b/wrappers/java/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/src/main/java/org/geuz/gmsh/utils) 
+    ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/src/main/java/org/geuz/gmsh/utils)
 # flag used to compilation during Java wrapping
 set(CMAKE_CXX_FLAGS "-fno-strict-aliasing")
 # find SWIG and include the swig file
@@ -15,19 +15,19 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 # define where the interface file (used by SWIG) are
 set(SWIG_SOURCES WrapGmsh.i)
 # let swig know that example.i is c++
-set_source_files_properties(${SWIG_SOURCES} PROPERTIES CPLUSPLUS ON) 
+set_source_files_properties(${SWIG_SOURCES} PROPERTIES CPLUSPLUS ON)
 # define where the Java files generated by SWIG will be stored
 set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/org/geuz/gmsh/generated/)
 # defines the packaging of Java files generated by SWIG
-set(JAVAPACKAGENAME "org.geuz.gmsh.generated") 
+set(JAVAPACKAGENAME "org.geuz.gmsh.generated")
 set(CMAKE_SWIG_FLAGS -package ${JAVAPACKAGENAME})
 # create the swig module called WrapGmsh
 # using the SWIG_SOURCE flag defined previously
 # swig will be used to create WrapGmshJAVA_wrap.cxx from SWIG_SOURCE
-swig_add_module(WrapGmsh java ${SWIG_SOURCES})  
+swig_add_module(WrapGmsh java ${SWIG_SOURCES})
 swig_link_libraries(WrapGmsh shared)
-  
-# link dynamic library called libWrapGmsh with the help of "sharedSrc" library 
+
+# link dynamic library called libWrapGmsh with the help of "sharedSrc" library
 
 # define a good name for the dynamic libraty which depends on the OS
 if(WIN32)
@@ -35,40 +35,40 @@ if(WIN32)
 endif(WIN32)
 if(UNIX)
   set_target_properties(WrapGmsh PROPERTIES PREFIX "lib")
-endif(UNIX)		
-add_custom_command(TARGET WrapGmsh 
+endif(UNIX)
+add_custom_command(TARGET WrapGmsh
 POST_BUILD # do the rest of the command after the build period
 # write on the output consol
   COMMAND cmake -E echo "Compiling Java files..."
   #compilation of Java files generated by SWIG
-  COMMAND ${JAVA_COMPILE} 
+  COMMAND ${JAVA_COMPILE}
     ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/org/geuz/gmsh/generated/*.java
     -classpath ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/
     -d ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/
-  # compilation of Java files used by wrapping		               
-  COMMAND ${JAVA_COMPILE} 
+  # compilation of Java files used by wrapping
+  COMMAND ${JAVA_COMPILE}
     ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/src/main/java/org/geuz/gmsh/utils/*.java
     -classpath ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/
     -d ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/
   # compilation of Java files used as demonstration
-  COMMAND ${JAVA_COMPILE} 
+  COMMAND ${JAVA_COMPILE}
     ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/src/main/java/com/artenum/sample/*.java
     -classpath ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/
     -d ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/
   # create a jar file which contains the files with a .class extension
   COMMAND cmake -E echo "Creating jar file..."
-  COMMAND ${JAVA_ARCHIVE} cvf ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar 
+  COMMAND ${JAVA_ARCHIVE} cvf ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
     -C ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/ org
-  COMMAND ${JAVA_ARCHIVE} cvf ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/Sample.jar 
+  COMMAND ${JAVA_ARCHIVE} cvf ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/Sample.jar
     -C ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/ com
   # create a jar from Sample
-  COMMAND ${CMAKE_COMMAND} -E copy 
-    ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/src/main/java/t5.geo 
+  COMMAND ${CMAKE_COMMAND} -E copy
+    ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/src/main/java/t5.geo
     ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/
   # copy the build.xml file to run the ant script
-  COMMAND ${CMAKE_COMMAND} -E copy 
-    ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml 
+  COMMAND ${CMAKE_COMMAND} -E copy
+    ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml
     ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/)
-install(TARGETS WrapGmsh DESTINATION lib OPTIONAL)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar 
-        DESTINATION lib)
+install(TARGETS WrapGmsh DESTINATION ${GMSH_LIB} OPTIONAL)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
+    DESTINATION ${GMSH_LIB})