From: maier Date: Sun, 14 Oct 2012 18:44:34 +0000 (+0000) Subject: Add support for FreeBSD X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08ce361857d0bb3e7bea22816a1bc8c623e0ab20;p=dealii-svn.git Add support for FreeBSD git-svn-id: https://svn.dealii.org/branches/branch_cmake@27118 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/TODO.CMAKE b/deal.II/TODO.CMAKE index 7ed4ba0358..2773ec5410 100644 --- a/deal.II/TODO.CMAKE +++ b/deal.II/TODO.CMAKE @@ -1,7 +1,5 @@ Major: -* Add support for native FreeBSD: -lpthread --> -pthread - * Add the rest of the Bug tests * Test the fparser 4.5 functionality. diff --git a/deal.II/cmake/configure/configure_1_tbb.cmake b/deal.II/cmake/configure/configure_1_tbb.cmake index 31b92f9c8c..e881213a6d 100644 --- a/deal.II/cmake/configure/configure_1_tbb.cmake +++ b/deal.II/cmake/configure/configure_1_tbb.cmake @@ -33,9 +33,25 @@ MACRO(SETUP_THREADING var) # # We support threading. Go on and configure the rest: # + SET(DEAL_II_USE_MT TRUE) + + # + # Change -lphtread to -pthread for more compatibility on non linux + # platforms: + # + IF("${CMAKE_THREAD_LIBS_INIT}" MATCHES "-lpthread") + CHECK_CXX_COMPILER_FLAG("-pthread" + DEAL_II_HAVE_FLAG_-pthread + ) + IF(DEAL_II_HAVE_FLAG_-pthread) + STRING(REPLACE "-lpthread" "-pthread" CMAKE_THREAD_LIBS_INIT + "${CMAKE_THREAD_LIBS_INIT}" + ) + ENDIF() + ENDIF() ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_THREAD_LIBS_INIT}") - SET(DEAL_II_USE_MT TRUE) + # # Set up some posix thread specific configuration toggles: