diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2018-07-04 13:17:05 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2018-07-04 13:17:05 +0200 |
| commit | 487299b564b5dc4e2f8d34c36f7e23e3791daf93 (patch) | |
| tree | 32347c908d937956c4482657140007d358d15044 /CMakeLists.txt | |
| parent | 2e8c0c872f99276602f9cd0daf06bfaf11832a08 (diff) | |
| download | nextpnr-487299b564b5dc4e2f8d34c36f7e23e3791daf93.tar.gz nextpnr-487299b564b5dc4e2f8d34c36f7e23e3791daf93.tar.bz2 nextpnr-487299b564b5dc4e2f8d34c36f7e23e3791daf93.zip | |
cleanup for MSVC
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6485ebdc..c3650a05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,9 @@ 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 /wd4459 /wd4121") -set(CMAKE_CXX_FLAGS_RELEASE "/W4 /wd4100 /wd4244 /wd4125 /wd4800 /wd4456 /wd4458 /wd4305 /wd4459 /wd4121") +set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE) +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /W4 /wd4100 /wd4244 /wd4125 /wd4800 /wd4456 /wd4458 /wd4305 /wd4459 /wd4121") +set(CMAKE_CXX_FLAGS_RELEASE "${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") @@ -127,11 +128,6 @@ if(MINGW) add_definitions("-Wa,-mbig-obj") endif(MINGW) -if (MSVC) - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /DNDEBUG /O2 /MD") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Od /MDd") -endif() - foreach (family ${FAMILIES}) string(TOUPPER ${family} ufamily) aux_source_directory(${family}/ ${ufamily}_FILES) |