From 00e4555ba10b6a4b190ab7b64d885b7770463f68 Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Wed, 13 Sep 2017 22:03:57 +0100
Subject: [PATCH] Fix up CMake build (unrelated)

---
 CMakeLists.txt               |  3 ++-
 src/CMakeLists.txt           |  1 -
 src/musketeer/CMakeLists.txt | 30 ------------------------------
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 src/musketeer/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5c0ef6893..99a97066cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.2)
 find_program(CCACHE_PROGRAM ccache)
 if(CCACHE_PROGRAM)
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+    message(STATUS "Rule launch compile: ${CCACHE_PROGRAM}")
  endif()
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
@@ -19,7 +20,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
     #   Ensure NDEBUG is not set for release builds
     set(CMAKE_CXX_FLAGS_RELEASE "-O2")
     #   Enable lots of warnings
-    set(CMAKE_CXX_FLAGS "-Wall -Wpedantic -Werror")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wpedantic -Werror")
 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
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a7be2e0fd3..13c6d0045b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -165,7 +165,6 @@ add_subdirectory(util)
 add_subdirectory(xmllang)
 add_subdirectory(java_bytecode)
 add_subdirectory(miniz)
-add_subdirectory(musketeer)
 add_subdirectory(clobber)
 add_subdirectory(cbmc)
 add_subdirectory(goto-cc)
diff --git a/src/musketeer/CMakeLists.txt b/src/musketeer/CMakeLists.txt
deleted file mode 100644
index 6265183ee0..0000000000
--- a/src/musketeer/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Library
-file(GLOB_RECURSE sources "*.cpp")
-file(GLOB_RECURSE headers "*.h")
-list(REMOVE_ITEM sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/musketeer_main.cpp
-)
-add_library(musketeer-lib ${sources} ${headers})
-
-generic_includes(musketeer-lib)
-
-target_link_libraries(musketeer-lib
-    ansi-c
-    linking
-    big-int
-    goto-programs
-    goto-symex
-    assembler
-    pointer-analysis
-    analyses
-    langapi
-    util
-    solvers
-    goto-instrument-lib
-)
-
-add_if_library(musketeer-lib glpk)
-
-# Executable
-add_executable(musketeer musketeer_main.cpp)
-target_link_libraries(musketeer musketeer-lib)