Merge pull request #562 from kenhys/add-multiarch

cmake: use GNUInstallDirs.cmake on UNIX

2 files changed, 14 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9124f9e..c3a8b99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,10 +30,18 @@ option(SPM_USE_BUILTIN_PROTOBUF "Use built-in protobuf" ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix "\${prefix}")
-set(libdir "\${exec_prefix}/lib")
-set(includedir "\${prefix}/include")
+if (UNIX)
+  include(GNUInstallDirs)
+  set(prefix ${CMAKE_INSTALL_PREFIX})
+  set(exec_prefix "\${prefix}")
+  set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
+  set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+else()
+  set(prefix ${CMAKE_INSTALL_PREFIX})
+  set(exec_prefix "\${prefix}")
+  set(libdir "\${exec_prefix}/lib")
+  set(includedir "\${prefix}/include")
+endif()
 set(GNUCXX_STD_SUPPORT_VERSION "4.3")
 
 if (SPM_USE_BUILTIN_PROTOBUF)
diff --git a/test.sh b/test.sh
index 339e03f..35dfda8 100755
--- a/test.sh
+++ b/test.sh
@@ -54,8 +54,8 @@ build_python() {
   cd build
   make install
   cd ..
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+  export LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig
   ldconfig -v
   cd python
   python3 setup.py test