Add CMakeBuild config for memory-analyzer

This commit adds the required files for the CMakeBuild system to build and generate the memory-analyzer

Author: mmuesly

CMakeLists.txt

@@ -148,6 +148,8 @@ set_target_properties(
     json-symtab-language
     langapi
     linking
+    memory-analyzer
+    memory-analyzer-lib
     pointer-analysis
     solvers
     testing-utils

src/CMakeLists.txt

@@ -93,8 +93,6 @@ add_subdirectory(json)
 add_subdirectory(json-symtab-language)
 add_subdirectory(langapi)
 add_subdirectory(linking)
-add_subdirectory(memory-analyzer)
-add_subdirectory(memory-models)
 add_subdirectory(pointer-analysis)
 add_subdirectory(solvers)
 add_subdirectory(util)
@@ -106,3 +104,4 @@ add_subdirectory(goto-instrument)
 add_subdirectory(goto-analyzer)
 add_subdirectory(goto-diff)
 add_subdirectory(goto-harness)
+add_subdirectory(memory-analyzer)

src/memory-analyzer/CMakeLists.txt

@@ -0,0 +1,19 @@
+# Library
+file(GLOB_RECURSE sources "*.cpp" "*.h")
+list(REMOVE_ITEM sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/memory-analyzer_main.cpp
+)
+add_library(memory-analyzer-lib ${sources})
+
+generic_includes(memory-analyzer-lib)
+
+target_link_libraries(memory-analyzer-lib
+    ansi-c
+    goto-programs
+    util
+)
+
+
+# Executable
+add_executable(memory-analyzer memory_analyzer_main.cpp)
+target_link_libraries(memory-analyzer memory-analyzer-lib)

unit/CMakeLists.txt

@@ -1,3 +1,14 @@
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
+   "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang" OR
+   "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU"
+)
+    #  private is overwritten in the gdb_api test cases
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-keyword-macro")
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    #   This would be the place to enable warnings for Windows builds, although
+    #   config.inc doesn't seem to do that currently
+endif()
+
 file(GLOB_RECURSE sources "*.cpp" "*.h")
 
 file(GLOB_RECURSE testing_utils "testing-utils/*.cpp" "testing-utils/*.h")