changed directory structure; changed CMakeLists

CMakeLists.txt

@@ -1,14 +1,12 @@
-cmake_minimum_required(VERSION 2.9)
+cmake_minimum_required(VERSION 3.0)
 
 project(MilterFrom C)
 
-set(CMAKE_CXX_STANDARD 11)
-
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
+list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 find_package(Threads REQUIRED)
 find_package(Milter REQUIRED)
 
-include_directories(${Milter_INCLUDE_DIRS})
-add_executable(milterfrom milterfrom.c)
-target_link_libraries(milterfrom ${Milter_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+add_executable(milterfrom src/milterfrom.c)
+target_include_directories(milterfrom PRIVATE ${Milter_INCLUDE_DIRS})
+target_link_libraries(milterfrom ${Milter_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})

README.md

@@ -33,7 +33,7 @@ chown milterfrom:milterfrom /var/spool/postfix/milterfrom
 Move the binary and the service file:
 ```bash
 cp milterfrom /usr/local/bin
-cp ../milterfrom.service /etc/systemd/system/
+cp ../systemd/milterfrom.service /etc/systemd/system/
 ```
 
 Configure postfix to use the milter:

FindMilter.cmake → cmake/FindMilter.cmake

@@ -28,7 +28,7 @@ find_library(Milter_LIBRARY
 	/sw/lib
 )
 
-SET(Milter_FOUND FALSE)
-IF(Milter_INCLUDE_DIR AND Milter_LIBRARY)
-	SET(Milter_FOUND TRUE)
-ENDIF(Milter_INCLUDE_DIR AND Milter_LIBRARY)
+set(Milter_FOUND FALSE)
+if(Milter_INCLUDE_DIR AND Milter_LIBRARY)
+	set(Milter_FOUND TRUE)
+endif(Milter_INCLUDE_DIR AND Milter_LIBRARY)