diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2018-07-03 10:22:22 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2018-07-03 10:22:22 +0200 |
| commit | 19e9866013f54f1ded262a93427f36bb263cd49d (patch) | |
| tree | a810359dd6eb7ad2c7f16f79b83b47977836cee5 | |
| parent | 1cf82930191d6498fc14e1854472f0d955a4c4ea (diff) | |
| download | nextpnr-19e9866013f54f1ded262a93427f36bb263cd49d.tar.gz nextpnr-19e9866013f54f1ded262a93427f36bb263cd49d.tar.bz2 nextpnr-19e9866013f54f1ded262a93427f36bb263cd49d.zip | |
Added suppression of python warnings and proper name for python boost lib for windows
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e265154..908df411 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") @@ -98,6 +98,13 @@ if (BUILD_PYTHON) 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}) if ("${Boost_LIBRARIES}" MATCHES ".*(python|PYTHON).*" ) |