diff options
-rw-r--r-- | CMakeLists.txt | 10 | ||||
-rw-r--r-- | tests/ice40/hx1k.cc | 1 | ||||
-rw-r--r-- | tests/ice40/hx8k.cc | 1 | ||||
-rw-r--r-- | tests/ice40/lp1k.cc | 1 | ||||
-rw-r--r-- | tests/ice40/lp384.cc | 1 | ||||
-rw-r--r-- | tests/ice40/lp8k.cc | 1 | ||||
-rw-r--r-- | tests/ice40/up5k.cc | 1 |
7 files changed, 3 insertions, 13 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) diff --git a/tests/ice40/hx1k.cc b/tests/ice40/hx1k.cc index afc007af..6c3205f3 100644 --- a/tests/ice40/hx1k.cc +++ b/tests/ice40/hx1k.cc @@ -29,7 +29,6 @@ class HX1KTest : public ::testing::Test protected: virtual void SetUp() { - IdString::global_ctx = nullptr; chipArgs.type = ArchArgs::HX1K; chipArgs.package = "tq144"; ctx = new Context(chipArgs); diff --git a/tests/ice40/hx8k.cc b/tests/ice40/hx8k.cc index 6197a106..485a2d31 100644 --- a/tests/ice40/hx8k.cc +++ b/tests/ice40/hx8k.cc @@ -29,7 +29,6 @@ class HX8KTest : public ::testing::Test protected: virtual void SetUp() { - IdString::global_ctx = nullptr; chipArgs.type = ArchArgs::HX8K; chipArgs.package = "ct256"; ctx = new Context(chipArgs); diff --git a/tests/ice40/lp1k.cc b/tests/ice40/lp1k.cc index b05fca24..b1092700 100644 --- a/tests/ice40/lp1k.cc +++ b/tests/ice40/lp1k.cc @@ -29,7 +29,6 @@ class LP1KTest : public ::testing::Test protected: virtual void SetUp() { - IdString::global_ctx = nullptr; chipArgs.type = ArchArgs::LP1K; chipArgs.package = "tq144"; ctx = new Context(chipArgs); diff --git a/tests/ice40/lp384.cc b/tests/ice40/lp384.cc index 150bf5da..287293d9 100644 --- a/tests/ice40/lp384.cc +++ b/tests/ice40/lp384.cc @@ -29,7 +29,6 @@ class LP384Test : public ::testing::Test protected: virtual void SetUp() { - IdString::global_ctx = nullptr; chipArgs.type = ArchArgs::LP384; chipArgs.package = "qn32"; ctx = new Context(chipArgs); diff --git a/tests/ice40/lp8k.cc b/tests/ice40/lp8k.cc index 0ff2328b..efe61b5b 100644 --- a/tests/ice40/lp8k.cc +++ b/tests/ice40/lp8k.cc @@ -29,7 +29,6 @@ class LP8KTest : public ::testing::Test protected: virtual void SetUp() { - IdString::global_ctx = nullptr; chipArgs.type = ArchArgs::LP8K; chipArgs.package = "ct256"; ctx = new Context(chipArgs); diff --git a/tests/ice40/up5k.cc b/tests/ice40/up5k.cc index 3282cba7..342a7c0a 100644 --- a/tests/ice40/up5k.cc +++ b/tests/ice40/up5k.cc @@ -29,7 +29,6 @@ class UP5KTest : public ::testing::Test protected: virtual void SetUp() { - IdString::global_ctx = nullptr; chipArgs.type = ArchArgs::UP5K; chipArgs.package = "sg48"; ctx = new Context(chipArgs); |