|
Lines 1-6
Link Here
|
| 1 |
--- fem/src/CMakeLists.txt.orig 2017-05-19 12:19:26 UTC |
1 |
--- fem/src/CMakeLists.txt.orig 2018-12-19 09:34:45 UTC |
| 2 |
+++ fem/src/CMakeLists.txt |
2 |
+++ fem/src/CMakeLists.txt |
| 3 |
@@ -129,11 +129,11 @@ SET(ELMERSOLVER_LIBRARIES matc umfpack |
3 |
@@ -175,14 +175,14 @@ ENDIF() |
| 4 |
|
4 |
|
| 5 |
|
5 |
|
| 6 |
ADD_EXECUTABLE(Solver_TGT Solver.F90) |
6 |
ADD_EXECUTABLE(Solver_TGT Solver.F90) |
|
Lines 8-21
Link Here
|
| 8 |
+SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME "${ELMERSOLVER_OUTPUT_NAME}") |
8 |
+SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME "${ELMERSOLVER_OUTPUT_NAME}") |
| 9 |
|
9 |
|
| 10 |
IF(NOT(WIN32)) |
10 |
IF(NOT(WIN32)) |
| 11 |
- SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING}) |
11 |
MESSAGE(STATUS " ELMERSOLVER_RPATH_STRING_MOD " ${ELMERSOLVER_RPATH_STRING_MOD}) |
|
|
12 |
MESSAGE(STATUS " ELMERLIB_RPATH_STRING " ${ELMERLIB_RPATH_STRING}) |
| 13 |
|
| 14 |
- SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING_MOD}) |
| 12 |
- SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH ${ELMERLIB_RPATH_STRING}) |
15 |
- SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH ${ELMERLIB_RPATH_STRING}) |
| 13 |
+ SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") |
16 |
+ SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING_MOD}") |
| 14 |
+ SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH "${ELMERLIB_RPATH_STRING}") |
17 |
+ SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH "${ELMERLIB_RPATH_STRING}") |
| 15 |
ENDIF() |
18 |
ENDIF() |
| 16 |
|
19 |
|
| 17 |
IF(NOT(WITH_MPI)) |
20 |
IF(NOT(WITH_MPI)) |
| 18 |
@@ -238,7 +238,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME |
21 |
@@ -287,7 +287,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELMERSOLVER_LIBRAR |
| 19 |
INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin") |
22 |
INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin") |
| 20 |
|
23 |
|
| 21 |
IF(NOT(WIN32)) |
24 |
IF(NOT(WIN32)) |
|
Lines 24-30
Link Here
|
| 24 |
ENDIF() |
27 |
ENDIF() |
| 25 |
|
28 |
|
| 26 |
# GebhardFactors |
29 |
# GebhardFactors |
| 27 |
@@ -247,7 +247,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${ |
30 |
@@ -296,7 +296,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${ELMERSOLVER_LI |
| 28 |
mpi_stubs elmersolver) |
31 |
mpi_stubs elmersolver) |
| 29 |
|
32 |
|
| 30 |
IF(NOT(WIN32)) |
33 |
IF(NOT(WIN32)) |
|
Lines 33-49
Link Here
|
| 33 |
ENDIF() |
36 |
ENDIF() |
| 34 |
|
37 |
|
| 35 |
IF(WITH_Trilinos) |
38 |
IF(WITH_Trilinos) |
| 36 |
@@ -291,9 +291,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE |
39 |
@@ -343,7 +343,7 @@ IF(WITH_MPI) |
| 37 |
|
40 |
# INSTALL(CODE " |
| 38 |
IF(WITH_MPI) |
41 |
# EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver |
| 39 |
IF(NOT(WIN32)) |
42 |
# WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") |
| 40 |
- INSTALL(CODE " |
43 |
- ADD_CUSTOM_TARGET(elmersolver_link ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver) |
| 41 |
- EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver |
44 |
+ # ADD_CUSTOM_TARGET(elmersolver_link ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver) |
| 42 |
- WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") |
45 |
ADD_DEPENDENCIES(elmersolver_link Solver_TGT) |
| 43 |
+ # Create symlink after, to respect STAGEDIR |
46 |
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ElmerSolver DESTINATION "bin") |
| 44 |
+ #INSTALL(CODE " |
|
|
| 45 |
+ #EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver |
| 46 |
+ #WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") |
| 47 |
ELSE() |
47 |
ELSE() |
| 48 |
INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy |
|
|
| 49 |
\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe |