Index: dolfin/CMakeLists.txt =================================================================== --- dolfin.orig/CMakeLists.txt 2020-08-28 22:10:35.631866823 +0800 +++ dolfin/CMakeLists.txt 2020-08-28 22:10:35.627866800 +0800 @@ -500,6 +500,7 @@ 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() Index: dolfin/cmake/templates/dolfin.pc.in =================================================================== --- dolfin.orig/cmake/templates/dolfin.pc.in 2020-08-28 22:10:35.631866823 +0800 +++ dolfin/cmake/templates/dolfin.pc.in 2020-08-28 22:10:35.627866800 +0800 @@ -13,5 +13,5 @@ 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@ Index: dolfin/python/dolfin/jit/jit.py =================================================================== --- dolfin.orig/python/dolfin/jit/jit.py 2020-08-28 22:10:35.631866823 +0800 +++ dolfin/python/dolfin/jit/jit.py 2020-08-28 22:10:35.627866800 +0800 @@ -5,6 +5,7 @@ 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 @@ 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.") Index: dolfin/dolfin/CMakeLists.txt =================================================================== --- dolfin.orig/dolfin/CMakeLists.txt 2020-08-28 22:10:35.631866823 +0800 +++ dolfin/dolfin/CMakeLists.txt 2020-08-28 22:10:35.627866800 +0800 @@ -343,8 +343,8 @@ 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 ) Index: dolfin/cmake/templates/DOLFINConfig.cmake.in =================================================================== --- dolfin.orig/cmake/templates/DOLFINConfig.cmake.in 2020-08-28 22:10:35.631866823 +0800 +++ dolfin/cmake/templates/DOLFINConfig.cmake.in 2020-08-28 22:10:38.000000000 +0800 @@ -43,7 +43,7 @@ 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@")