Add shared library mode to Travis CI. (google#24)

xrootd · Nov 15, 2018 · 75e82b8 · 75e82b8
1 parent a458d36
commit 75e82b8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,10 +14,12 @@ os:
   - osx
 
 env:
-  - GLOG=1 BUILD_TYPE=Debug
-  - GLOG=1 BUILD_TYPE=RelWithDebInfo
-  - GLOG=0 BUILD_TYPE=Debug
-  - GLOG=0 BUILD_TYPE=RelWithDebInfo
+  - GLOG=1 SHARED_LIB=0 BUILD_TYPE=Debug
+  - GLOG=1 SHARED_LIB=0 BUILD_TYPE=RelWithDebInfo
+  - GLOG=0 SHARED_LIB=0 BUILD_TYPE=Debug
+  - GLOG=0 SHARED_LIB=0 BUILD_TYPE=RelWithDebInfo
+  - GLOG=0 SHARED_LIB=1 BUILD_TYPE=Debug
+  - GLOG=0 SHARED_LIB=1 BUILD_TYPE=RelWithDebInfo
 
 matrix:
   exclude:
@@ -58,6 +60,7 @@ install:
 before_script:
 - mkdir -p build && cd build
 - cmake .. -DCRC32C_USE_GLOG=$GLOG -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+           -DBUILD_SHARED_LIBS=$SHARED_LIB
 - cmake --build .
 - cd ..
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -229,8 +229,8 @@ if(HAVE_ARM64_CRC32C)
   endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 endif(HAVE_ARM64_CRC32C)
 # CMake only enables PIC by default in SHARED and MODULE targets.
-set_property(TARGET crc32c_arm64 PROPERTY POSITION_INDEPENDENT_CODE
-  "${BUILD_SHARED_LIBS}")
+set_property(TARGET crc32c_arm64
+    PROPERTY POSITION_INDEPENDENT_CODE "${BUILD_SHARED_LIBS}")
 
 # SSE4.2 code is built separately, so we don't accidentally compile unsupported
 # instructions into code that gets run without SSE4.2 support.
@@ -249,8 +249,8 @@ if(HAVE_SSE42)
   endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 endif(HAVE_SSE42)
 # CMake only enables PIC by default in SHARED and MODULE targets.
-set_property(TARGET crc32c_sse42 PROPERTY POSITION_INDEPENDENT_CODE
-  "${BUILD_SHARED_LIBS}")
+set_property(TARGET crc32c_sse42
+    PROPERTY POSITION_INDEPENDENT_CODE "${BUILD_SHARED_LIBS}")
 
 add_library(crc32c ""
   # TODO(pwnall): Move the TARGET_OBJECTS generator expressions to the PRIVATE

diff --git a/third_party/benchmark b/third_party/benchmark
diff --git a/third_party/glog b/third_party/glog
diff --git a/third_party/googletest b/third_party/googletest
+1 −0		AUTHORS
+4 −3		CMakeLists.txt
+1 −0		CONTRIBUTORS
+5 −5		cmake/CXXFeatureCheck.cmake
+1 −1		cmake/GetGitVersion.cmake
+1 −0		include/benchmark/benchmark.h
+6 −0		src/json_reporter.cc
+9 −0		src/reporter.cc
+20 −1		src/sysinfo.cc
+8 −2		test/reporter_output_test.cc
+29 −43		BUILD.bazel
+8 −1		CMakeLists.txt
+1 −1		googlemock/README.md
+1 −0		googlemock/docs/CheatSheet.md
+10 −11		googlemock/include/gmock/gmock-actions.h
+4 −4		googlemock/include/gmock/gmock-cardinalities.h
+2 −1		googlemock/include/gmock/gmock-generated-actions.h
+2 −1		googlemock/include/gmock/gmock-generated-actions.h.pump
+0 −562		googlemock/include/gmock/gmock-generated-function-mockers.h
+0 −118		googlemock/include/gmock/gmock-generated-function-mockers.h.pump
+7 −26		googlemock/include/gmock/gmock-matchers.h
+158 −91		googlemock/include/gmock/gmock-spec-builders.h
+0 −9		googlemock/include/gmock/internal/gmock-internal-utils.h
+3 −4		googlemock/include/gmock/internal/gmock-port.h
+7 −6		googlemock/src/gmock-spec-builders.cc
+8 −25		googlemock/test/BUILD.bazel
+2 −2		googlemock/test/gmock-actions_test.cc
+8 −8		googlemock/test/gmock-generated-actions_test.cc
+5 −19		googlemock/test/gmock-generated-function-mockers_test.cc
+1 −7		googlemock/test/gmock-internal-utils_test.cc
+9 −31		googlemock/test/gmock-matchers_test.cc
+1 −10		googlemock/test/gmock-more-actions_test.cc
+4 −4		googlemock/test/gmock-spec-builders_test.cc
+1 −1		googlemock/test/gmock_link_test.h
+0 −81		googlemock/test/gmock_stress_test.cc
+0 −1		googletest/CMakeLists.txt
+0 −2		googletest/Makefile.am
+17 −8		googletest/README.md
+4 −26		googletest/cmake/internal_utils.cmake
+1 −1		googletest/docs/advanced.md
+3 −2		googletest/include/gtest/gtest-message.h
+13 −5		googletest/include/gtest/gtest.h
+32 −31		googletest/include/gtest/internal/gtest-death-test-internal.h
+38 −33		googletest/include/gtest/internal/gtest-internal.h
+0 −243		googletest/include/gtest/internal/gtest-linked_ptr.h
+13 −9		googletest/include/gtest/internal/gtest-param-util-generated.h
+5 −1		googletest/include/gtest/internal/gtest-param-util-generated.h.pump
+10 −11		googletest/include/gtest/internal/gtest-param-util.h
+16 −70		googletest/include/gtest/internal/gtest-port.h
+1 −1		googletest/make/Makefile
+146 −81		googletest/src/gtest-death-test.cc
+5 −5		googletest/src/gtest-filepath.cc
+4 −3		googletest/src/gtest-internal-inl.h
+40 −40		googletest/src/gtest-port.cc
+26 −43		googletest/src/gtest.cc
+18 −48		googletest/test/BUILD.bazel
+0 −151		googletest/test/googletest-linked-ptr-test.cc
+1 −2		googletest/test/googletest-output-test_.cc
+2 −9		googletest/test/googletest-port-test.cc
+0 −1		googletest/test/googletest-shuffle-test_.cc
+1 −1		googletest/test/googletest-test-part-test.cc
+0 −1		googletest/test/gtest_all_test.cc
+17 −0		googletest/test/gtest_skip_test.cc
+1 −2		googletest/test/gtest_stress_test.cc
+6 −30		googletest/test/gtest_unittest.cc