Merge pull request #7923 from esteffin/esteffin/remove-memory-analyzer-on-mac-and-win

Stop building memory-analyzer on Mac and Windows

Author: Enrico Steffinlongo

src/CMakeLists.txt

@@ -122,6 +122,6 @@ add_subdirectory(symtab2gb)
 add_subdirectory(libcprover-cpp)
 add_subdirectory(goto-bmc)
 
-if(UNIX OR WITH_MEMORY_ANALYZER)
+if((NOT WIN32 AND NOT APPLE) OR WITH_MEMORY_ANALYZER)
 add_subdirectory(memory-analyzer)
 endif()

src/Makefile

@@ -52,9 +52,9 @@ else
   detected_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown')
 endif
 
-ifeq ($(detected_OS),Linux)
+ifeq ($(WITH_MEMORY_ANALYZER),1)
   all: memory-analyzer.dir
-else ifeq ($(WITH_MEMORY_ANALYZER),1)
+else ifneq ($(filter-out Windows Darwin,$(detected_OS)),)
   all: memory-analyzer.dir
 endif