--- fem/src/CMakeLists.txt.orig	2014-09-25 15:07:43.000000000 +0200
+++ fem/src/CMakeLists.txt	2014-10-06 23:29:26.000000000 +0200
@@ -117,9 +117,9 @@
 
 
 ADD_EXECUTABLE(Solver_TGT Solver.F90)
-  SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME ${ELMERSOLVER_OUTPUT_NAME})
+  SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME "${ELMERSOLVER_OUTPUT_NAME}")
 IF(NOT(WIN32))
-   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
+   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
 ENDIF()
 
 IF(NOT(WITH_MPI))
@@ -214,7 +214,7 @@
 INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
 
 IF(NOT(WIN32))
-  SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
+  SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
 ENDIF()
 
 # GebhardFactors
@@ -223,7 +223,7 @@
                                       mpi_stubs elmersolver)
 
 IF(NOT(WIN32))
-  SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
+  SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
 ENDIF()
 
 IF(WITH_Trilinos)
@@ -267,9 +267,10 @@
 
 IF(WITH_MPI)
   IF(NOT(WIN32))
-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink
-    \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi
-    \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver)")
+    # Create symlink after, to repect STAGEDIR
+    #INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink
+    #\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi
+    #\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver)")
   ELSE()
     INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy
     \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe
