Merge pull request YosysHQ#114 from mithro/master

cmake: Don't clobber existing CMAKE_CXX_FLAGS values.
f4pga · Jan 6, 2020 · e43f545 · e43f545
2 parents d8c5e9d + c29f6bd
commit e43f545
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libtrellis/CMakeLists.txt b/libtrellis/CMakeLists.txt
@@ -7,9 +7,9 @@ option(STATIC_BUILD "Create static build of Trellis tools" OFF)
 
 set(CMAKE_CXX_STANDARD 14)
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-bigobj -EHsc")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -bigobj -EHsc")
 else()
-    set(CMAKE_CXX_FLAGS "-Wall -pedantic -Wextra -O3")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -O3")
 endif()
 set(CMAKE_DEFIN)
 set(link_param "")