Merge branch 'msgpack:c_master' into c_master

.github/workflows/gha.yml

@@ -18,6 +18,9 @@ jobs:
         pattern: [0, 1, 2, 3]
     steps:
     - uses: actions/checkout@v1
+    - name: install gtest
+      run: |
+        brew install --force googletest
     - name: build and test
       env:
         CC: clang
@@ -48,22 +51,8 @@ jobs:
           export CHAR_SIGN="unsigned"
         fi
 
-        # install gtest
-        wget https://github.com/google/googletest/archive/release-1.7.0.zip -O googletest-release-1.7.0.zip
-        unzip -q googletest-release-1.7.0.zip
-        cd googletest-release-1.7.0
-        $CXX -m${ARCH} src/gtest-all.cc -I. -Iinclude -c
-        $CXX -m${ARCH} src/gtest_main.cc -I. -Iinclude -c
-        ar -rv libgtest.a gtest-all.o
-        ar -rv libgtest_main.a gtest_main.o
-        mkdir -p ${BASE}/usr/include
-        cp -r include/gtest ${BASE}/usr/include
-        mkdir -p ${BASE}/usr/lib
-        mv *.a ${BASE}/usr/lib
-        cd ..
-
         # build and test
-        CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" GTEST_ROOT="${BASE}/usr" CFLAGS="-Werror -g -fsanitize=undefined  -fno-sanitize-recover=all" CXXFLAGS="-Werror -g -ggdb3 -fsanitize=undefined  -fno-sanitize-recover=all" ${ACTION}
+        CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" CFLAGS="-Werror -g -fsanitize=undefined  -fno-sanitize-recover=all" CXXFLAGS="-Werror -g -ggdb3 -fsanitize=undefined  -fno-sanitize-recover=all" ${ACTION}
 
   linux:
     runs-on: ubuntu-latest

CMakeLists.txt

@@ -30,8 +30,16 @@ LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
 include(GNUInstallDirs)
 SET (prefix ${CMAKE_INSTALL_PREFIX})
 SET (exec_prefix ${CMAKE_INSTALL_PREFIX})
-SET (libdir ${CMAKE_INSTALL_LIBDIR})
-SET (includedir ${CMAKE_INSTALL_INCLUDEDIR})
+IF (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
+    SET (libdir ${CMAKE_INSTALL_LIBDIR})
+ELSE ()
+    SET (libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
+ENDIF ()
+IF (IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR})
+    SET (includedir ${CMAKE_INSTALL_INCLUDEDIR})
+ELSE ()
+    SET (includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+ENDIF ()
 
 OPTION (MSGPACK_32BIT "32bit compile" OFF)
 

ci/build_cmake.sh

@@ -42,7 +42,7 @@ then
     exit $ret
 fi
 
-ctest -VVr
+ctest -VV
 
 ret=$?
 if [ $ret -ne 0 ]