Have cmake option -DK_WAY_HEAP=n (where n is a value >= 2) only define

a macro when compiling simulators since the dmClock library no longer uses it. Signed-off-by: J. Eric Ivancich <[email protected]>
ivancich · Jan 9, 2017 · 9d72e7d · 9d72e7d
1 parent c978332
commit 9d72e7d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,7 @@ if(K_WAY_HEAP)
   if(K_WAY_HEAP LESS 2)
     message(FATAL_ERROR "K_WAY_HEAP value should be at least 2")
   else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DK_WAY_HEAP=${K_WAY_HEAP}")
+    set(CMAKE_CXX_SIM_FLAGS "-DK_WAY_HEAP=${K_WAY_HEAP}")
   endif()
 endif()
 

diff --git a/sim/src/CMakeLists.txt b/sim/src/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(../../src) # dmclock code
 include_directories(../../support/src)
 include_directories(${BOOST_INCLUDE_DIR})
 
-set(local_flags "-Wall -pthread")
+set(local_flags "-Wall -pthread ${CMAKE_CXX_SIM_FLAGS}")
 
 set(ssched_sim_srcs test_ssched.cc test_ssched_main.cc)
 set(dmc_sim_srcs test_dmclock.cc test_dmclock_main.cc)