Fix up CMake build (unrelated)
This commit is contained in:
parent
81f1300f43
commit
00e4555ba1
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
Loading…
Reference in New Issue