File toolsdir.patch of Package ElmerFEM

Overview Repositories Revisions Requests Users Attributes Meta

File toolsdir.patch of Package ElmerFEM (Revision efac993e5c51c47ff1ba2f50cd5dfccc)

Currently displaying revision efac993e5c51c47ff1ba2f50cd5dfccc , Show latest

--- fem/src/elmerf90.in.cmake	2014-11-16 01:00:22.595470772 +0100
+++ fem/src/elmerf90.in.cmake.new	2014-11-16 00:57:14.994977405 +0100
@@ -2,11 +2,11 @@
 
 if test "$ELMER_LIB" = ""; then
   if  test "$ELMER_HOME" = ""; then
-     LIBDIR=@ELMER_SOLVER_HOME@/../../@ELMER_INSTALL_LIB_DIR@
-     INCLUDE=@ELMER_SOLVER_HOME@/include
+     LIBDIR="@CMAKE_INSTALL_LIBDIR@/elmersolver/@CMAKE_INSTALL_LIB@"
+     INCLUDE="@CMAKE_INSTALL_LIBDIR@/elmersolver/include"
   else
-     LIBDIR=$ELMER_HOME/@ELMER_INSTALL_LIB_DIR@
-     INCLUDE=$ELMER_HOME/share/elmersolver/include
+     LIBDIR=$ELMER_HOME/@CMAKE_INSTALL_LIB@/elmersolver/@CMAKE_INSTALL_LIB@
+     INCLUDE=$ELMER_HOME/@CMAKE_INSTALL_LIB@/elmersolver/include
   fi
 else
   LIBDIR=$ELMER_LIB
--- fem/src/elmerld.in.cmake	2014-11-03 00:30:31.925721644 +0100
+++ fem/src/elmerld.in.cmake.new	2014-11-16 00:50:40.200411496 +0100
@@ -2,18 +2,18 @@
 
 if test "$ELMER_LIB" = ""; then
   if  test "$ELMER_HOME" = ""; then
-     LIBDIR=@prefix@/lib
+     LIBDIR="@CMAKE_INSTALL_LIBDIR@/elmersolver/@CMAKE_INSTALL_LIB@"
   else
-     LIBDIR=$ELMER_HOME/lib
+     LIBDIR=$ELMER_HOME/@CMAKE_INSTALL_LIB@
   fi
 else
   LIBDIR=$ELMER_LIB
 fi
 
 LD=@CMAKE_Fortran_COMPILER@
-cmd="$LD @CMAKE_Fortran_FLAGS@ @CMAKE_SHARED_LIBRARY_Fortran_FLAGS@ @CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS@ $* -L@CMAKE_INSTALL_PREFIX@/@ELMER_INSTALL_LIB_DIR@ -L$LIBDIR -lelmersolver"
+cmd="$LD @CMAKE_Fortran_FLAGS@ @CMAKE_SHARED_LIBRARY_Fortran_FLAGS@ @CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS@ $* -L@ELMER_INSTALL_LIB_DIR@ -L$LIBDIR -L@CMAKE_INSTALL_LIBDIR@ -lelmersolver"
 printf "%s " $cmd
 printf "\n"
-$LD @CMAKE_Fortran_FLAGS@ @CMAKE_SHARED_LIBRARY_Fortran_FLAGS@ @CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS@ $* -L@CMAKE_INSTALL_PREFIX@/@ELMER_INSTALL_LIB_DIR@ -L$LIBDIR -lelmersolver
+$LD @CMAKE_Fortran_FLAGS@ @CMAKE_SHARED_LIBRARY_Fortran_FLAGS@ @CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS@ $* -L@ELMER_INSTALL_LIB_DIR@ -L$LIBDIR -lelmersolver
 # @USE_WINDOWS_COMPILER_TRUE@@SH_LD@ @SH_LDFLAGS@ @SH_LINKING_TO_FLAGS@ @B64FLAGS@ @EXTRA_LIBS@ $* -L$LIBDIR -lelmersolver
 # @USE_WINDOWS_COMPILER_FALSE@@SH_LD@ @SH_LDFLAGS@ @SH_LINKING_TO_FLAGS@ @B64FLAGS@ @EXTRA_LIBS@ $*

Places

File toolsdir.patch of Package ElmerFEM (Revision efac993e5c51c47ff1ba2f50cd5dfccc)

Places