From e8b812fd08b0c482afd5877dc6097046a92434ef Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 22 Mar 2017 20:44:42 +0000 Subject: [PATCH] Teach the CMake build script how to find the Boost libraries git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7619 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8580e2169..6e5e8d27d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -720,6 +720,18 @@ endif (APPLE) find_program(CTAGS ctags) find_program(ETAGS etags) +# +# Boost +# +set (Boost_NO_SYSTEM_PATHS TRUE) +if (Boost_NO_SYSTEM_PATHS) + set (BOOST_ROOT ${PROJECT_SOURCE_DIR}/boost) +endif () +find_package (Boost 1.63 REQUIRED) +if (Boost_FOUND) + include_directories (${Boost_INCLUDE_DIRS}) +endif () + # # OpenMP # @@ -781,7 +793,7 @@ set (CMAKE_VISIBILITY_INLINES_HIDDEN ON) # set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11 -fexceptions -frtti") +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fexceptions -frtti") if (NOT APPLE) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas") @@ -798,14 +810,12 @@ endif (NOT APPLE) if (WIN32) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") endif (WIN32) -if (APPLE) - if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") - endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") -else (APPLE) +if (APPLE AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++") +else () set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") -endif (APPLE) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=gnu++11 -pthread") +endif () #