Merge pull request #4 from dfateyev/master

pkg-config and libdir improvements
halon · Jul 2, 2019 · 30e4826 · 30e4826
2 parents 54dd997 + b1796ae
commit 30e4826
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,11 +63,11 @@ ENDIF(NOT DEFINED LIB_INSTALL_DIR)
 
 FILE(GLOB_RECURSE files src/*.hpp)
 INSTALL(FILES ${files} DESTINATION include/libdkim++)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.so DESTINATION lib)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.so.${TARGET_VERSION} DESTINATION lib)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.so.${TARGET_VERSION_MAJOR} DESTINATION lib)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.so DESTINATION lib${LIB_SUFFIX})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.so.${TARGET_VERSION} DESTINATION lib${LIB_SUFFIX})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.so.${TARGET_VERSION_MAJOR} DESTINATION lib${LIB_SUFFIX})
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libdkim++.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
 # Make FreeBSD packages
 IF (CMAKE_SYSTEM_NAME MATCHES BSD)

diff --git a/libdkim++.pc.cmake b/libdkim++.pc.cmake
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIB_INSTALL_DIR@
+libdir=${exec_prefix}/lib@LIB_SUFFIX@
 includedir=${prefix}/include
 
 Name: libdkim++

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,4 +1,6 @@
-INCLUDE(FindCppUnit.cmake)
+INCLUDE(FindPkgConfig)
+
+PKG_CHECK_MODULES(CPPUNIT cppunit)
 
 FILE(GLOB_RECURSE UnitTestSrc "src/*Test.cpp" )