mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-09-30 09:06:38 -04:00
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
This commit is contained in:
parent
c95bb069e0
commit
e8b812fd08
@ -720,6 +720,18 @@ endif (APPLE)
|
|||||||
find_program(CTAGS ctags)
|
find_program(CTAGS ctags)
|
||||||
find_program(ETAGS etags)
|
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
|
# OpenMP
|
||||||
#
|
#
|
||||||
@ -781,7 +793,7 @@ set (CMAKE_VISIBILITY_INLINES_HIDDEN ON)
|
|||||||
#
|
#
|
||||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
|
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)
|
if (NOT APPLE)
|
||||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas")
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas")
|
||||||
@ -798,14 +810,12 @@ endif (NOT APPLE)
|
|||||||
if (WIN32)
|
if (WIN32)
|
||||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
|
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
|
||||||
endif (WIN32)
|
endif (WIN32)
|
||||||
if (APPLE)
|
if (APPLE AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
|
||||||
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
|
||||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
|
else ()
|
||||||
endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
|
|
||||||
else (APPLE)
|
|
||||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
|
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
|
||||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=gnu++11 -pthread")
|
||||||
endif (APPLE)
|
endif ()
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user