lib_rename

===================================================================

Gbp-Pq: Name lib_rename.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe4757422e57dd090c86c6cc7fdb812b657f4b4c..8754ee1a0d2c33c040bd900709f20de7af06ca1f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -500,6 +500,7 @@ if (DOLFIN_WITH_LIBRARY_VERSION)
   set(DOLFIN_LIBRARY_PROPERTIES ${DOLFIN_LIBRARY_PROPERTIES}
     VERSION ${DOLFIN_LIBRARY_VERSION}
     SOVERSION ${DOLFIN_VERSION_MAJOR}.${DOLFIN_VERSION_MINOR}
+    OUTPUT_NAME "dolfin${LIB_NAME_EXT}"
   )
 endif()
 

diff --git a/cmake/templates/DOLFINConfig.cmake.in b/cmake/templates/DOLFINConfig.cmake.in
index 346b2d589d24a8dbb9b983e355fa42b770d19d12..bdad95e77383d8c8ae9d14897ab557f0359360b7 100644 (file)
--- a/cmake/templates/DOLFINConfig.cmake.in
+++ b/cmake/templates/DOLFINConfig.cmake.in
@@ -43,7 +43,7 @@ set(DOLFIN_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@DOLFIN_INCLUDE_DIR@")
 set(DOLFIN_3RD_PARTY_INCLUDE_DIRS "@DOLFIN_DEP_INCLUDE_DIRECTORIES@;@DOLFIN_DEP_SYSTEM_INCLUDE_DIRECTORIES@")
 
 # DOLFIN library
-set(DOLFIN_LIBRARIES dolfin)
+set(DOLFIN_LIBRARIES dolfin${DOLFIN_LIB_NAME_EXT})
 
 # Version
 set(DOLFIN_VERSION_MAJOR "@DOLFIN_VERSION_MAJOR@")

diff --git a/cmake/templates/dolfin.pc.in b/cmake/templates/dolfin.pc.in
index 3faf2c35bbd8b3ccd35429ba5a6b551459f19aef..d6a206998e309d0170eb64e50d34b8de1c40bc28 100644 (file)
--- a/cmake/templates/dolfin.pc.in
+++ b/cmake/templates/dolfin.pc.in
@@ -13,5 +13,5 @@ Description: Dynamic Object-oriented Library for FINite element computation
 Version: @DOLFIN_VERSION@
 Requires: @PKG_REQUIRES@
 Conflicts:
-Libs: @PKG_LINKFLAGS@ -L${libdir} -ldolfin
+Libs: @PKG_LINKFLAGS@ -L${libdir} -ldolfin@LIB_NAME_EXT@
 Cflags: @PKG_CXXFLAGS@ -DDOLFIN_VERSION=\"@DOLFIN_VERSION@\" ${definitions} -I${includedir} @PKG_INCLUDES@

diff --git a/dolfin/CMakeLists.txt b/dolfin/CMakeLists.txt
index fb8b53f40c1047b5585926967a6c21be040def3a..452cb9805c46b63230fbd0d191a7beb9fa1188a1 100644 (file)
--- a/dolfin/CMakeLists.txt
+++ b/dolfin/CMakeLists.txt
@@ -343,8 +343,8 @@ endforeach()
 get_target_property(BOOST_INCLUDE_DIR Boost::boost INTERFACE_INCLUDE_DIRECTORIES)
 
 # Configure and install pkg-config file
-configure_file(${DOLFIN_CMAKE_DIR}/templates/dolfin.pc.in ${CMAKE_BINARY_DIR}/dolfin.pc @ONLY)
-install(FILES ${CMAKE_BINARY_DIR}/dolfin.pc
+configure_file(${DOLFIN_CMAKE_DIR}/templates/dolfin.pc.in ${CMAKE_BINARY_DIR}/dolfin${LIB_NAME_EXT}.pc @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/dolfin${LIB_NAME_EXT}.pc
   DESTINATION ${DOLFIN_PKGCONFIG_DIR}
   COMPONENT Development
   )

diff --git a/python/dolfin/jit/jit.py b/python/dolfin/jit/jit.py
index 5ac1ba23b6228218c597e58696d92b62f6d70f5c..367b57211b3e24349ff4b4527c6299f2928a7f92 100644 (file)
--- a/python/dolfin/jit/jit.py
+++ b/python/dolfin/jit/jit.py
@@ -5,6 +5,7 @@ import numpy
 import hashlib
 import dijitso
 import dolfin.cpp as cpp
+import dolfin.la as la
 
 from dolfin.cpp import MPI
 from functools import wraps
@@ -12,7 +13,9 @@ import ffc
 from dolfin.cpp.parameter import parameters
 
 # Get DOLFIN pkg-config data
-if pkgconfig.exists("dolfin"):
+if la.la_index_dtype()==la.int64 and pkgconfig.exists("dolfin64"):
+    dolfin_pc = pkgconfig.parse("dolfin64")
+elif pkgconfig.exists("dolfin"):
     dolfin_pc = pkgconfig.parse("dolfin")
 else:
     raise RuntimeError("Could not find DOLFIN pkg-config file. Please make sure appropriate paths are set.")