Merge pull request #1707 from ndim/fix-cmake-builds-related-to-ac_cfg.h

Fix cmake build errors related to ac_cfg.h

Author: stefanrueger

.gitignore

@@ -55,6 +55,9 @@ cscope.out
 out/
 build/
 build_*/
+CMakeFiles/
+/CMakeCache.txt
+cmake_install.cmake
 
 # Visual Studio
 .vs/

src/CMakeLists.txt

@@ -113,10 +113,19 @@ endif()
 # Configure files
 # =====================================
 
-configure_file(cmake_config.h.in ac_cfg.h)
-configure_file(avrdude.spec.in avrdude.spec)
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_config.h.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/ac_cfg.h"
+)
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/avrdude.spec.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/avrdude.spec"
+)
 if(WIN32 OR MINGW)
-    configure_file(windows.rc.in windows.rc)
+  configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/windows.rc.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/windows.rc"
+  )
 endif()
 
 add_custom_command(
@@ -142,7 +151,7 @@ add_custom_target(conf ALL DEPENDS avrdude.conf)
 # =====================================
 
 add_library(libavrdude
-    ac_cfg.h
+    ${CMAKE_CURRENT_BINARY_DIR}/ac_cfg.h
     arduino.h
     arduino.c
     avr.c
@@ -316,6 +325,7 @@ add_executable(avrdude
     developer_opts_private.h
     whereami.c
     whereami.h
+    ${CMAKE_CURRENT_BINARY_DIR}/ac_cfg.h
     ${EXTRA_WINDOWS_RESOURCES}
     )
 

src/arduino.c

@@ -25,7 +25,7 @@
  * are read differently.
  */
 
-#include "ac_cfg.h"
+#include <ac_cfg.h>
 
 #include <stdio.h>
 #include <string.h>

src/avr.c

@@ -19,7 +19,7 @@
 
 /* $Id$ */
 
-#include "ac_cfg.h"
+#include <ac_cfg.h>
 
 #include <stdio.h>
 #include <stdlib.h>

src/avr910.c

@@ -25,7 +25,7 @@
  * protocol described in application note avr910.
  */
 
-#include "ac_cfg.h"
+#include <ac_cfg.h>
 
 #include <stdio.h>
 #include <stdlib.h>

src/avrcache.c

@@ -18,7 +18,7 @@
 
 /* $Id$ */
 
-#include "ac_cfg.h"
+#include <ac_cfg.h>
 
 #include <stdio.h>
 #include <stdlib.h>

src/avrftdi.c

@@ -21,7 +21,7 @@
 /*
  * Interface to the MPSSE Engine of FTDI Chips using libftdi.
  */
-#include "ac_cfg.h"
+#include <ac_cfg.h>
 
 #include <stdio.h>
 #include <stdlib.h>

src/avrftdi_private.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "ac_cfg.h"
+#include <ac_cfg.h>
 
 #include <stdint.h>
 

src/avrftdi_tpi.c

@@ -1,4 +1,4 @@
-#include "ac_cfg.h"
+#include <ac_cfg.h>
 
 #include <stdint.h>
 #include <string.h>

src/avrintel.c

@@ -13,7 +13,7 @@
  *
  */
 
-#include "ac_cfg.h"
+#include <ac_cfg.h>
 
 #include <ctype.h>
 #include <string.h>