Changeset View
Changeset View
Standalone View
Standalone View
head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt
| --- fem/src/CMakeLists.txt.orig 2016-10-26 13:01:22 UTC | --- fem/src/CMakeLists.txt.orig 2017-05-19 12:19:26 UTC | ||||
| +++ fem/src/CMakeLists.txt | +++ fem/src/CMakeLists.txt | ||||
| @@ -137,11 +137,11 @@ ENDIF() | @@ -129,11 +129,11 @@ SET(ELMERSOLVER_LIBRARIES matc umfpack | ||||
| ADD_EXECUTABLE(Solver_TGT Solver.F90) | 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}) | ||||
| +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)) | 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}) | ||||
| - SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH ${ELMERLIB_RPATH_STRING}) | - SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH ${ELMERLIB_RPATH_STRING}) | ||||
| + SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") | + SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") | ||||
| + SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH "${ELMERLIB_RPATH_STRING}") | + SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH "${ELMERLIB_RPATH_STRING}") | ||||
| ENDIF() | ENDIF() | ||||
| IF(NOT(WITH_MPI)) | IF(NOT(WITH_MPI)) | ||||
| @@ -246,7 +246,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME | @@ -238,7 +238,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME | ||||
| INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin") | INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin") | ||||
| IF(NOT(WIN32)) | IF(NOT(WIN32)) | ||||
| - SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING}) | - SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING}) | ||||
| + SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") | + SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") | ||||
| ENDIF() | ENDIF() | ||||
| # GebhardFactors | # GebhardFactors | ||||
| @@ -255,7 +255,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${ | @@ -247,7 +247,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${ | ||||
| mpi_stubs elmersolver) | mpi_stubs elmersolver) | ||||
| IF(NOT(WIN32)) | IF(NOT(WIN32)) | ||||
| - SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING}) | - SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING}) | ||||
| + SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") | + SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") | ||||
| ENDIF() | ENDIF() | ||||
| IF(WITH_Trilinos) | IF(WITH_Trilinos) | ||||
| @@ -299,9 +299,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE | @@ -291,9 +291,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE | ||||
| IF(WITH_MPI) | IF(WITH_MPI) | ||||
| IF(NOT(WIN32)) | IF(NOT(WIN32)) | ||||
| - INSTALL(CODE " | - INSTALL(CODE " | ||||
| - EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver | - EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver | ||||
| - WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") | - WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") | ||||
| + # Create symlink after, to respect STAGEDIR | + # Create symlink after, to respect STAGEDIR | ||||
| + #INSTALL(CODE " | + #INSTALL(CODE " | ||||
| + #EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver | + #EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver | ||||
| + #WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") | + #WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") | ||||
| ELSE() | ELSE() | ||||
| INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy | INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy | ||||
| \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe | \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe | ||||