diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ba530fa..104efb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,12 +11,9 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}) set(ENTITYX_BUILD_TESTING false CACHE BOOL "Enable building of tests.") set(ENTITYX_RUN_BENCHMARKS false CACHE BOOL "Run benchmarks (in conjunction with -DENTITYX_BUILD_TESTING=1).") set(ENTITYX_MAX_COMPONENTS 64 CACHE STRING "Set the maximum number of components.") -set(ENTITYX_USE_CPP11_STDLIB false CACHE BOOL "For Clang, specify whether to use libc++ (-stdlib=libc++).") -# Check for which shared_ptr implementation to use. -set(ENTITYX_USE_STD_SHARED_PTR false CACHE BOOL "Use std::shared_ptr<T> rather than boost::shared_ptr<T>?") -set(ENTITYX_BUILD_SHARED true CACHE BOOL "Build shared libraries?") -set(ENTITYX_BUILD_PYTHON true CACHE BOOL "Build entityx::python?") -set(ENTITYX_BOOST_SP_DISABLE_THREADS false CACHE BOOL "Disable multi-threading support in boost::shared_ptr") +set(ENTITYX_USE_CPP11_STDLIB true CACHE BOOL "For Clang, specify whether to use libc++ (-stdlib=libc++).") +set(ENTITYX_BUILD_SHARED false CACHE BOOL "Build shared libraries?") +set(ENTITYX_BUILD_PYTHON false CACHE BOOL "Build entityx::python?") include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) include(CheckCXXSourceCompiles) @@ -28,14 +25,30 @@ set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") +# C++11 feature checks +include(CheckCXX11Features.cmake) + +add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1) +set(OLD_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +check_cxx_source_compiles( +" +#include <memory> + +int main() { + std::shared_ptr<int>(); +} +" +ENTITYX_HAVE_CXX11_STDLIB +) -if (ENTITYX_BOOST_SP_DISABLE_THREADS) - message("-- Disabled multi-threading support in Boost (see http://www.boost.org/doc/libs/1_54_0/libs/smart_ptr/shared_ptr.htm)") - add_definitions(-DBOOST_SP_DISABLE_THREADS=1) +if (NOT ENTITYX_HAVE_CXX11_STDLIB) + message("-- Not using -stdlib=libc++ (test failed to build)") + set(CMAKE_CXX_FLAGS "${OLD_CMAKE_CXX_FLAGS}") +else () + message("-- Using -stdlib=libc++") endif () -# C++11 feature checks -include(CheckCXX11Features.cmake) # Misc features check_include_file("stdint.h" HAVE_STDINT_H) @@ -55,9 +68,6 @@ macro(create_test TARGET_NAME SOURCE) entityx gtest gtest_main - ${Boost_SYSTEM_LIBRARY} - ${Boost_TIMER_LIBRARY} - ${Boost_SIGNALS_LIBRARY} ${ARGN} ) add_test(${TARGET_NAME} ${TARGET_NAME}) @@ -81,9 +91,6 @@ require(HAS_CXX11_LONG_LONG "C++11 lambdas") message("-- Checking misc features") require(HAVE_STDINT_H "stdint.h") -set(Boost_USE_STATIC_LIBS OFF) -set(Boost_USE_MULTITHREADED ON) -set(Boost_USE_STATIC_RUNTIME OFF) if (ENTITYX_BUILD_PYTHON) message("-- Building with Python support (-DENTITYX_BUILD_PYTHON=0 to disable)") find_package(Boost 1.48.0 COMPONENTS python) @@ -91,7 +98,6 @@ else (ENTITYX_BUILD_PYTHON) message("-- Python support disabled") endif (ENTITYX_BUILD_PYTHON) -include_directories(${Boost_INCLUDE_DIR}) set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") @@ -100,9 +106,7 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") # Things to install set(install_libs entityx) -include(CheckCXX11SharedPtr.cmake) - -set(sources entityx/tags/TagsComponent.cc entityx/deps/Dependencies.cc entityx/System.cc entityx/Event.cc entityx/Entity.cc entityx/Manager.cc) +set(sources entityx/tags/TagsComponent.cc entityx/deps/Dependencies.cc entityx/System.cc entityx/Event.cc entityx/Entity.cc entityx/Manager.cc entityx/help/Timer.cc) add_library(entityx STATIC ${sources}) if (ENTITYX_BUILD_SHARED) @@ -110,14 +114,11 @@ if (ENTITYX_BUILD_SHARED) add_library(entityx_shared SHARED ${sources}) target_link_libraries( entityx_shared - ${Boost_SIGNALS_LIBRARY} ) set_target_properties(entityx_shared PROPERTIES OUTPUT_NAME entityx) list(APPEND install_libs entityx_shared) endif (ENTITYX_BUILD_SHARED) -include_directories(${Boost_INCLUDE_DIR}) - if (ENTITYX_BUILD_PYTHON AND Boost_PYTHON_LIBRARY) message("-- Found boost::python, building entityx/python") find_package(PythonLibs REQUIRED) @@ -149,7 +150,7 @@ if (ENTITYX_BUILD_PYTHON AND Boost_PYTHON_LIBRARY) endif (ENTITYX_BUILD_PYTHON AND Boost_PYTHON_LIBRARY) if (ENTITYX_BUILD_TESTING) - find_package(Boost 1.48.0 REQUIRED COMPONENTS timer system) + #find_package(Boost 1.48.0 REQUIRED COMPONENTS timer system) add_subdirectory(gtest-1.6.0) include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR}) enable_testing() |