Lines 1-6
Link Here
|
1 |
--- fem/src/CMakeLists.txt.orig 2014-09-25 15:07:43.000000000 +0200 |
1 |
--- fem/src/CMakeLists.txt.orig 2014-12-18 03:11:20.000000000 -0500 |
2 |
+++ fem/src/CMakeLists.txt 2014-10-06 23:29:26.000000000 +0200 |
2 |
+++ fem/src/CMakeLists.txt 2015-01-06 15:46:33.994140478 -0500 |
3 |
@@ -117,9 +117,9 @@ |
3 |
@@ -119,9 +119,9 @@ |
4 |
|
4 |
|
5 |
|
5 |
|
6 |
ADD_EXECUTABLE(Solver_TGT Solver.F90) |
6 |
ADD_EXECUTABLE(Solver_TGT Solver.F90) |
Lines 12-18
Link Here
|
12 |
ENDIF() |
12 |
ENDIF() |
13 |
|
13 |
|
14 |
IF(NOT(WITH_MPI)) |
14 |
IF(NOT(WITH_MPI)) |
15 |
@@ -214,7 +214,7 @@ |
15 |
@@ -216,7 +216,7 @@ |
16 |
INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin") |
16 |
INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin") |
17 |
|
17 |
|
18 |
IF(NOT(WIN32)) |
18 |
IF(NOT(WIN32)) |
Lines 21-27
Link Here
|
21 |
ENDIF() |
21 |
ENDIF() |
22 |
|
22 |
|
23 |
# GebhardFactors |
23 |
# GebhardFactors |
24 |
@@ -223,7 +223,7 @@ |
24 |
@@ -225,7 +225,7 @@ |
25 |
mpi_stubs elmersolver) |
25 |
mpi_stubs elmersolver) |
26 |
|
26 |
|
27 |
IF(NOT(WIN32)) |
27 |
IF(NOT(WIN32)) |
Lines 30-46
Link Here
|
30 |
ENDIF() |
30 |
ENDIF() |
31 |
|
31 |
|
32 |
IF(WITH_Trilinos) |
32 |
IF(WITH_Trilinos) |
33 |
@@ -267,9 +267,10 @@ |
33 |
@@ -269,9 +269,10 @@ |
34 |
|
34 |
|
35 |
IF(WITH_MPI) |
35 |
IF(WITH_MPI) |
36 |
IF(NOT(WIN32)) |
36 |
IF(NOT(WIN32)) |
37 |
- INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink |
37 |
- INSTALL(CODE " |
38 |
- \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi |
38 |
- EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver |
39 |
- \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver)") |
39 |
- WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") |
40 |
+ # Create symlink after, to repect STAGEDIR |
40 |
+ # Create symlink after, to respect STAGEDIR |
41 |
+ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink |
41 |
+ #INSTALL(CODE " |
42 |
+ #\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi |
42 |
+ #EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver |
43 |
+ #\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver)") |
43 |
+ #WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") |
44 |
ELSE() |
44 |
ELSE() |
45 |
INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy |
45 |
INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy |
46 |
\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe |
46 |
\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe |