Skip to content

Commit dc4a293

Browse files
chrisr-diffbluechrisr-diffblue
authored
Merge pull request diffblue#1594 from reuk/reuk/cmake-fixup
Tidy up CMakeLists
2 parents 48fc3d4 + d3d632d commit dc4a293

30 files changed

+108
-107
lines changed

‎CMakeLists.txt

+46
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,49 @@ if(${enable_cbmc_tests})
4141
endif()
4242
add_subdirectory(unit)
4343
add_subdirectory(regression)
44+
45+
set_target_properties(
46+
analyses
47+
ansi-c
48+
assembler
49+
big-int
50+
cbmc
51+
cbmc-lib
52+
clobber
53+
clobber-lib
54+
cpp
55+
driver
56+
goto-analyzer
57+
goto-analyzer-lib
58+
goto-cc
59+
goto-cc-lib
60+
goto-diff
61+
goto-diff-lib
62+
goto-instrument
63+
goto-instrument-lib
64+
goto-programs
65+
goto-symex
66+
java_bytecode
67+
jbmc
68+
jbmc-lib
69+
jsil
70+
json
71+
langapi
72+
linking
73+
miniBDD
74+
miniz
75+
mmcc
76+
pointer-analysis
77+
solvers
78+
string_utils
79+
test-bigint
80+
testing-utils
81+
unit
82+
util
83+
xml
84+
85+
PROPERTIES
86+
CXX_STANDARD 11
87+
CXX_STANDARD_REQUIRED true
88+
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Developer ID Application: Daniel Kroening"
89+
)

‎regression/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
set(CMAKE_CXX_STANDARD 11)
2-
set(CMAKE_CXX_STANDARD_REQUIRED true)
3-
41
set(test_pl_path "${CMAKE_CURRENT_SOURCE_DIR}/test.pl")
52

63
macro(add_test_pl_profile name cmdline flag profile)

‎scripts/glucose_CMakeLists.txt

+8
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ add_library(glucose-condensed
66
core/Solver.cc
77
)
88

9+
set_target_properties(
10+
glucose-condensed
11+
PROPERTIES
12+
CXX_STANDARD 11
13+
CXX_STANDARD_REQUIRED true
14+
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Developer ID Application: Daniel Kroening"
15+
)
16+
917
target_include_directories(glucose-condensed
1018
PUBLIC
1119
${CMAKE_CURRENT_SOURCE_DIR}

‎scripts/minisat2_CMakeLists.txt

+8
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ add_library(minisat2-condensed
66
minisat/core/Solver.cc
77
)
88

9+
set_target_properties(
10+
minisat2-condensed
11+
PROPERTIES
12+
CXX_STANDARD 11
13+
CXX_STANDARD_REQUIRED true
14+
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Developer ID Application: Daniel Kroening"
15+
)
16+
917
target_include_directories(minisat2-condensed
1018
PUBLIC
1119
${CMAKE_CURRENT_SOURCE_DIR}

‎src/CMakeLists.txt

-24
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,8 @@
1-
cmake_minimum_required(VERSION 3.2)
2-
3-
# TODO
4-
# -[ ] Install profiles.
5-
# -[ ] Specify one of many different solver libraries.
6-
71
project(CBMC)
82

9-
set(CMAKE_CXX_STANDARD 11)
10-
set(CMAKE_CXX_STANDARD_REQUIRED true)
11-
12-
set(CMAKE_EXPORT_COMPILE_COMMANDS true)
13-
143
find_package(BISON)
154
find_package(FLEX)
165

17-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
18-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
19-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
20-
21-
include(CPack)
22-
236
find_package(Doxygen)
247
if(DOXYGEN_FOUND)
258
add_custom_target(doc
@@ -97,13 +80,6 @@ macro(add_if_library target name)
9780
endif()
9881
endmacro(add_if_library)
9982

100-
# Override add_executable to automatically sign the target on OSX.
101-
function(add_executable name)
102-
_add_executable(${name} ${ARGN})
103-
set_target_properties(${name} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY
104-
"Developer ID Application: Daniel Kroening")
105-
endfunction(add_executable)
106-
10783
add_subdirectory(analyses)
10884
add_subdirectory(ansi-c)
10985
add_subdirectory(assembler)

‎src/analyses/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
file(GLOB_RECURSE sources "*.cpp")
2-
file(GLOB_RECURSE headers "*.h")
3-
add_library(analyses ${sources} ${headers})
1+
file(GLOB_RECURSE sources "*.cpp" "*.h")
2+
add_library(analyses ${sources})
43

54
generic_includes(analyses)
65

‎src/ansi-c/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ set(extra_dependencies
9696
${CMAKE_CURRENT_BINARY_DIR}/library-check.stamp
9797
)
9898

99-
file(GLOB_RECURSE sources "*.cpp")
100-
file(GLOB_RECURSE headers "*.h")
99+
file(GLOB_RECURSE sources "*.cpp" "*.h")
101100

102101
list(REMOVE_ITEM sources
103102
"${CMAKE_CURRENT_SOURCE_DIR}/library/converter.cpp"
@@ -106,7 +105,6 @@ list(REMOVE_ITEM sources
106105

107106
add_library(ansi-c
108107
${sources}
109-
${headers}
110108
${BISON_parser_OUTPUTS}
111109
${FLEX_scanner_OUTPUTS}
112110
)

‎src/assembler/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
generic_flex(assembler)
22

3-
file(GLOB_RECURSE sources "*.cpp")
4-
file(GLOB_RECURSE headers "*.h")
3+
file(GLOB_RECURSE sources "*.cpp" "*.h")
54
add_library(assembler
65
${sources}
7-
${headers}
86
${FLEX_scanner_OUTPUTS}
97
)
108

‎src/cbmc/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Library
2-
file(GLOB_RECURSE sources "*.cpp")
3-
file(GLOB_RECURSE headers "*.h")
2+
file(GLOB_RECURSE sources "*.cpp" "*.h")
43
list(REMOVE_ITEM sources
54
${CMAKE_CURRENT_SOURCE_DIR}/cbmc_main.cpp
65
)
7-
add_library(cbmc-lib ${sources} ${headers})
6+
add_library(cbmc-lib ${sources})
87

98
generic_includes(cbmc-lib)
109

‎src/clobber/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Library
2-
file(GLOB_RECURSE sources "*.cpp")
3-
file(GLOB_RECURSE headers "*.h")
2+
file(GLOB_RECURSE sources "*.cpp" "*.h")
43
list(REMOVE_ITEM sources
54
${CMAKE_CURRENT_SOURCE_DIR}/clobber_main.cpp
65
)
7-
add_library(clobber-lib ${sources} ${headers})
6+
add_library(clobber-lib ${sources})
87

98
generic_includes(clobber-lib)
109

‎src/cpp/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
file(GLOB_RECURSE sources "*.cpp")
2-
file(GLOB_RECURSE headers "*.h")
3-
add_library(cpp ${sources} ${headers})
1+
file(GLOB_RECURSE sources "*.cpp" "*.h")
2+
add_library(cpp ${sources})
43

54
generic_includes(cpp)
65

‎src/goto-analyzer/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Library
2-
file(GLOB_RECURSE sources "*.cpp")
3-
file(GLOB_RECURSE headers "*.h")
2+
file(GLOB_RECURSE sources "*.cpp" "*.h")
43
list(REMOVE_ITEM sources
54
${CMAKE_CURRENT_SOURCE_DIR}/goto_analyzer_main.cpp
65
)
7-
add_library(goto-analyzer-lib ${sources} ${headers})
6+
add_library(goto-analyzer-lib ${sources})
87

98
generic_includes(goto-analyzer-lib)
109

‎src/goto-cc/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Library
2-
file(GLOB_RECURSE sources "*.cpp")
3-
file(GLOB_RECURSE headers "*.h")
2+
file(GLOB_RECURSE sources "*.cpp" "*.h")
43
list(REMOVE_ITEM sources
54
${CMAKE_CURRENT_SOURCE_DIR}/goto_cc_main.cpp
65
)
7-
add_library(goto-cc-lib ${sources} ${headers})
6+
add_library(goto-cc-lib ${sources})
87

98
generic_includes(goto-cc-lib)
109

‎src/goto-diff/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Library
2-
file(GLOB_RECURSE sources "*.cpp")
3-
file(GLOB_RECURSE headers "*.h")
2+
file(GLOB_RECURSE sources "*.cpp" "*.h")
43
list(REMOVE_ITEM sources
54
${CMAKE_CURRENT_SOURCE_DIR}/goto_diff_main.cpp
65
)
7-
add_library(goto-diff-lib ${sources} ${headers})
6+
add_library(goto-diff-lib ${sources})
87

98
generic_includes(goto-diff-lib)
109

‎src/goto-instrument/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
# Library
2-
file(GLOB_RECURSE sources "*.cpp")
3-
file(GLOB_RECURSE headers "*.h")
2+
file(GLOB_RECURSE sources "*.cpp" "*.h")
43
list(REMOVE_ITEM sources
54
${CMAKE_CURRENT_SOURCE_DIR}/goto_instrument_main.cpp
65

76
# This doesn't build
87
${CMAKE_CURRENT_SOURCE_DIR}/accelerate/linearize.cpp
98
)
10-
add_library(goto-instrument-lib ${sources} ${headers})
9+
add_library(goto-instrument-lib ${sources})
1110

1211
generic_includes(goto-instrument-lib)
1312

‎src/goto-programs/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
file(GLOB_RECURSE sources "*.cpp")
2-
file(GLOB_RECURSE headers "*.h")
3-
add_library(goto-programs ${sources} ${headers})
1+
file(GLOB_RECURSE sources "*.cpp" "*.h")
2+
add_library(goto-programs ${sources})
43

54
generic_includes(goto-programs)
65

‎src/goto-symex/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
file(GLOB_RECURSE sources "*.cpp")
2-
file(GLOB_RECURSE headers "*.h")
3-
add_library(goto-symex ${sources} ${headers})
1+
file(GLOB_RECURSE sources "*.cpp" "*.h")
2+
add_library(goto-symex ${sources})
43

54
generic_includes(goto-symex)
65

‎src/java_bytecode/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
file(GLOB_RECURSE sources "*.cpp")
2-
file(GLOB_RECURSE headers "*.h")
3-
add_library(java_bytecode ${sources} ${headers})
1+
file(GLOB_RECURSE sources "*.cpp" "*.h")
2+
add_library(java_bytecode ${sources})
43

54
generic_includes(java_bytecode)
65

‎src/jbmc/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Library
2-
file(GLOB_RECURSE sources "*.cpp")
3-
file(GLOB_RECURSE headers "*.h")
2+
file(GLOB_RECURSE sources "*.cpp" "*.h")
43
list(REMOVE_ITEM sources
54
${CMAKE_CURRENT_SOURCE_DIR}/jbmc_main.cpp
65
)
7-
add_library(jbmc-lib ${sources} ${headers})
6+
add_library(jbmc-lib ${sources})
87

98
generic_includes(jbmc-lib)
109

‎src/jsil/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
generic_bison(jsil)
22
generic_flex(jsil)
33

4-
file(GLOB_RECURSE sources "*.cpp")
5-
file(GLOB_RECURSE headers "*.h")
4+
file(GLOB_RECURSE sources "*.cpp" "*.h")
65
add_library(jsil
76
${sources}
8-
${headers}
97
${BISON_parser_OUTPUTS}
108
${FLEX_scanner_OUTPUTS}
119
)

‎src/json/CMakeLists.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
generic_bison(json)
22
generic_flex(json)
33

4-
file(GLOB_RECURSE sources "*.cpp")
5-
file(GLOB_RECURSE headers "*.h")
6-
add_library(json
4+
file(GLOB_RECURSE sources "*.cpp" "*.h")
5+
add_library(json
76
${sources}
8-
${headers}
97
${BISON_parser_OUTPUTS}
108
${FLEX_scanner_OUTPUTS}
119
)

‎src/langapi/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
file(GLOB_RECURSE sources "*.cpp")
2-
file(GLOB_RECURSE headers "*.h")
3-
add_library(langapi ${sources} ${headers})
1+
file(GLOB_RECURSE sources "*.cpp" "*.h")
2+
add_library(langapi ${sources})
43

54
generic_includes(langapi)
65

‎src/linking/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
file(GLOB_RECURSE sources "*.cpp")
2-
file(GLOB_RECURSE headers "*.h")
3-
add_library(linking ${sources} ${headers})
1+
file(GLOB_RECURSE sources "*.cpp" "*.h")
2+
add_library(linking ${sources})
43

54
generic_includes(linking)
65

‎src/memory-models/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
generic_bison(mm)
22
generic_flex(mm)
33

4-
file(GLOB_RECURSE sources "*.cpp")
5-
file(GLOB_RECURSE headers "*.h")
4+
file(GLOB_RECURSE sources "*.cpp" "*.h")
65
add_library(mmcc
76
${sources}
8-
${headers}
97
${BISON_parser_OUTPUTS}
108
${FLEX_scanner_OUTPUTS}
119
)

‎src/miniz/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
file(GLOB_RECURSE sources "*.cpp")
2-
file(GLOB_RECURSE headers "*.h")
3-
add_library(miniz ${sources} ${headers})
1+
file(GLOB_RECURSE sources "*.cpp" "*.h")
2+
add_library(miniz ${sources})
43

54
generic_includes(miniz)
65

‎src/pointer-analysis/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
file(GLOB_RECURSE sources "*.cpp")
2-
file(GLOB_RECURSE headers "*.h")
3-
add_library(pointer-analysis ${sources} ${headers})
1+
file(GLOB_RECURSE sources "*.cpp" "*.h")
2+
add_library(pointer-analysis ${sources})
43

54
generic_includes(pointer-analysis)
65

‎src/solvers/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ set(limmat_source
4545
${CMAKE_CURRENT_SOURCE_DIR}/sat/satcheck_limmat.cpp
4646
)
4747

48-
file(GLOB_RECURSE sources "*.cpp")
49-
file(GLOB_RECURSE headers "*.h")
48+
file(GLOB_RECURSE sources "*.cpp" "*.h")
5049
list(REMOVE_ITEM sources
5150
${chaff_source}
5251
${minisat_source}
@@ -63,7 +62,7 @@ list(REMOVE_ITEM sources
6362
${limmat_source}
6463
)
6564

66-
add_library(solvers ${sources} ${headers})
65+
add_library(solvers ${sources})
6766

6867
include("${CBMC_SOURCE_DIR}/../cmake/DownloadProject.cmake")
6968

‎src/util/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
file(GLOB_RECURSE sources "*.cpp")
2-
file(GLOB_RECURSE headers "*.h")
3-
add_library(util ${sources} ${headers})
1+
file(GLOB_RECURSE sources "*.cpp" "*.h")
2+
add_library(util ${sources})
43

54
generic_includes(util)
65

0 commit comments

Comments
 (0)