Skip to content
Snippets Groups Projects

Cmake refactoring was merged to main, merge back to devel also

Merged Cmake refactoring was merged to main, merge back to devel also
main into devel
Merged Mederic Fourmy requested to merge main into devel
Viewing commit 24feb2fe
Prev Next
Show latest version
1 file
+ 1
− 1
Compare changes
  • Side-by-side
  • Inline
test/gtest/CMakeLists.txt
+ 1
− 1
@@ -5,7 +5,7 @@ if(${CMAKE_VERSION} VERSION_LESS "3.11.0")
@@ -5,7 +5,7 @@ if(${CMAKE_VERSION} VERSION_LESS "3.11.0")
include(ExternalProject)
include(ExternalProject)
set(GTEST_FORCE_SHARED_CRT ON)
set(GTEST_FORCE_SHARED_CRT ON)
set(GTEST_DISABLE_PTHREADS OFF)
set(GTEST_DISABLE_PTHREADS ON)
# For some reason I need to disable PTHREADS
# For some reason I need to disable PTHREADS
# with g++ (Ubuntu 4.9.3-8ubuntu2~14.04) 4.9.3
# with g++ (Ubuntu 4.9.3-8ubuntu2~14.04) 4.9.3