Added suppression of python warnings and proper name for python boost lib for windows
This commit is contained in:
parent
1cf8293019
commit
19e9866013
@ -10,8 +10,8 @@ option(BUILD_TESTS "Build GUI" OFF)
|
||||
set(FAMILIES generic ice40)
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
if (MSVC)
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "/W4 /wd4100 /wd4244 /wd4125 /wd4800 /wd4456 /wd4458 /wd4305")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "/W4 /wd4100 /wd4244 /wd4125 /wd4800 /wd4456 /wd4458 /wd4305")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "/W4 /wd4100 /wd4244 /wd4125 /wd4800 /wd4456 /wd4458 /wd4305 /wd4459 /wd4121")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "/W4 /wd4100 /wd4244 /wd4125 /wd4800 /wd4456 /wd4458 /wd4305 /wd4459 /wd4121")
|
||||
else()
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -fPIC -ggdb")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "-Wall -fPIC -O3 -g")
|
||||
@ -97,6 +97,13 @@ if (BUILD_PYTHON)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (NOT Boost_PYTHON_FOUND)
|
||||
find_package(Boost COMPONENTS python36 ${boost_libs})
|
||||
if ("${Boost_LIBRARIES}" MATCHES ".*(python|PYTHON).*" )
|
||||
set(Boost_PYTHON_FOUND TRUE)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (NOT Boost_PYTHON_FOUND)
|
||||
STRING(REGEX REPLACE "([0-9]+\\.[0-9]+).*" "\\1" gentoo_version ${PYTHONLIBS_VERSION_STRING})
|
||||
find_package(Boost COMPONENTS python-${gentoo_version} ${boost_libs})
|
||||
|
Loading…
Reference in New Issue
Block a user