Skip to content

Commit fbc2a98

Browse files
committed
Fix mis-merge add re-add OPTION_BUILD_WITH_BOOST_THREAD cmake option
1 parent 7b3e507 commit fbc2a98

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

CMakeLists.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,14 @@ string(TOUPPER ${META_PROJECT_ID} META_PROJECT_ID)
7070
#
7171

7272
# Project options
73-
option(BUILD_SHARED_LIBS "Build shared instead of static libraries." ON)
74-
option(OPTION_SELF_CONTAINED "Create a self-contained install with all dependencies." OFF)
75-
option(OPTION_BUILD_TESTS "Build tests." ON)
76-
option(OPTION_BUILD_GPU_TESTS "Build tests that require an OpenGL context." ON)
77-
option(OPTION_BUILD_DOCS "Build documentation." OFF)
78-
option(OPTION_BUILD_TOOLS "Build tools." ON)
79-
option(OPTION_BUILD_EXAMPLES "Build examples." OFF)
73+
option(BUILD_SHARED_LIBS "Build shared instead of static libraries." ON)
74+
option(OPTION_SELF_CONTAINED "Create a self-contained install with all dependencies." OFF)
75+
option(OPTION_BUILD_TESTS "Build tests." ON)
76+
option(OPTION_BUILD_GPU_TESTS "Build tests that require an OpenGL context." ON)
77+
option(OPTION_BUILD_DOCS "Build documentation." OFF)
78+
option(OPTION_BUILD_TOOLS "Build tools." ON)
79+
option(OPTION_BUILD_EXAMPLES "Build examples." OFF)
80+
option(OPTION_BUILD_WITH_BOOST_THREAD "Use boost::thread instead of std::thread." OFF)
8081

8182

8283
#

0 commit comments

Comments
 (0)