blob: bd99ee31bb4309d0dafe12003a9d0453ef4cf4a4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
CMakeLists.txt | 2 +-
src/CMakeLists.txt | 4 ++--
zmap_conf_install.cmake.in | 7 -------
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aeb1c7f..0378f44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,4 +67,4 @@ add_subdirectory(src)
FILE(GLOB CONF_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/conf" "conf/*")
message(STATUS "${CONF_FILES}")
configure_file(zmap_conf_install.cmake.in zmap_conf_install.cmake)
-install(SCRIPT "${PROJECT_SOURCE_DIR}/zmap_conf_install.cmake")
+install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/zmap_conf_install.cmake")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6e51f12..2c1ae5a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -75,11 +75,11 @@ add_custom_command(OUTPUT zopt.h
)
add_custom_command(OUTPUT lexer.c
- COMMAND flex -o "${CMAKE_CURRENT_BINARY_DIR}/lexer.c" --header-file="${CMAKE_CURRENT_BINARY_DIR}/lexer.h" lexer.l
+ COMMAND flex -o "${CMAKE_CURRENT_BINARY_DIR}/lexer.c" --header-file="${CMAKE_CURRENT_BINARY_DIR}/lexer.h" "${CMAKE_CURRENT_SOURCE_DIR}/lexer.l"
)
add_custom_command(OUTPUT parser.c
- COMMAND byacc -d -o parser.c parser.y
+ COMMAND byacc -d -o "${CMAKE_CURRENT_BINARY_DIR}/parser.c" "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
)
add_executable(zmap ${SOURCES})
diff --git a/zmap_conf_install.cmake.in b/zmap_conf_install.cmake.in
index c1b2f61..695e7dd 100644
--- a/zmap_conf_install.cmake.in
+++ b/zmap_conf_install.cmake.in
@@ -1,10 +1,3 @@
-message(STATUS "Creating /etc/zmap")
-if (NOT EXISTS "/etc/zmap/")
- file(MAKE_DIRECTORY "/etc/zmap")
-else()
- message(STATUS "/etc/zmap exists, skipping...")
-endif()
-
message(STATUS "Installing blacklist.conf...")
if (NOT EXISTS "/etc/zmap/blacklist.conf")
file(INSTALL "${PROJECT_SOURCE_DIR}/conf/blacklist.conf" DESTINATION "/etc/zmap")
|
GitWeb
