Make disabling of thread support a configuration time option. This mainly exists for testing purposes.
This commit is contained in:
parent
2b80ca8cc5
commit
e1fbf54e40
@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.8)
|
|||||||
|
|
||||||
project(chaiscript)
|
project(chaiscript)
|
||||||
|
|
||||||
|
option(MULTITHREAD_SUPPORT_ENABLED "Multithreaded Support Enabled" TRUE)
|
||||||
|
|
||||||
list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_BINARY_DIR}")
|
list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_BINARY_DIR}")
|
||||||
list(APPEND CPACK_SOURCE_IGNORE_FILES "\\\\.svn")
|
list(APPEND CPACK_SOURCE_IGNORE_FILES "\\\\.svn")
|
||||||
list(APPEND CPACK_SOURCE_IGNORE_FILES ".swp")
|
list(APPEND CPACK_SOURCE_IGNORE_FILES ".swp")
|
||||||
@ -58,13 +60,17 @@ include_directories(include)
|
|||||||
SET(Boost_ADDITIONAL_VERSIONS "1.43" "1.43.0" "1.42" "1.42.0" "1.41")
|
SET(Boost_ADDITIONAL_VERSIONS "1.43" "1.43.0" "1.42" "1.42.0" "1.41")
|
||||||
SET(Boost_USE_MULTITHREADED ON)
|
SET(Boost_USE_MULTITHREADED ON)
|
||||||
|
|
||||||
find_package(Boost 1.36.0 COMPONENTS thread)
|
if (MULTITHREAD_SUPPORT_ENABLED)
|
||||||
|
find_package(Boost 1.36.0 COMPONENTS thread)
|
||||||
|
|
||||||
if (Boost_FOUND)
|
if (Boost_FOUND)
|
||||||
link_directories( ${Boost_LIBRARY_DIRS} )
|
link_directories( ${Boost_LIBRARY_DIRS} )
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR "Can not find Boost")
|
||||||
|
endif(Boost_FOUND)
|
||||||
else()
|
else()
|
||||||
message(FATAL_ERROR "Can not find Boost")
|
ADD_DEFINITIONS(-DCHAISCRIPT_NO_THREADS)
|
||||||
endif(Boost_FOUND)
|
endif()
|
||||||
|
|
||||||
if (CMAKE_HOST_UNIX)
|
if (CMAKE_HOST_UNIX)
|
||||||
SET(DYNAMIC_LOADER "dl")
|
SET(DYNAMIC_LOADER "dl")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user