diff --git a/CMakeModules/MinGWResourceCompiler.cmake b/CMakeModules/MinGWResourceCompiler.cmake index d02c82a2c6..76253f1e84 100644 --- a/CMakeModules/MinGWResourceCompiler.cmake +++ b/CMakeModules/MinGWResourceCompiler.cmake @@ -10,7 +10,7 @@ macro(mingw_resource_compiler _NAME) dbg_msg("_IN: ${_IN}") # Output file. - set(_OUT "${CMAKE_CURRENT_BINARY_DIR}/${_NAME}_rc.o") + set(_OUT "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_NAME}.dir/${_NAME}_rc.obj") dbg_msg("_OUT: ${_OUT}") # Include directories. @@ -28,6 +28,7 @@ macro(mingw_resource_compiler _NAME) add_custom_command(OUTPUT ${_OUT} COMMAND windres.exe ARGS ${_ARGS} + COMMENT "Compiling ${_NAME} resource file." VERBATIM) # Set a NAME_RESOURCES variable diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt index 891269496f..784bb4a5b9 100644 --- a/cvpcb/CMakeLists.txt +++ b/cvpcb/CMakeLists.txt @@ -58,6 +58,7 @@ set(CVPCB_EXTRA_SRCS if(WIN32) if(MINGW) + # CVPCB_RESOURCES variable is set by the macro. mingw_resource_compiler(cvpcb) else(MINGW) set(CVPCB_RESOURCES cvpcb.rc) diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt index 30b91a033e..775ab62bfd 100644 --- a/eeschema/CMakeLists.txt +++ b/eeschema/CMakeLists.txt @@ -103,6 +103,7 @@ set(EESCHEMA_EXTRA_SRCS if(WIN32) if(MINGW) + # EESCHEMA_RESOURCES variable is set by the macro. mingw_resource_compiler(eeschema) else(MINGW) set(EESCHEMA_RESOURCES eeschema.rc) diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt index 7a91052439..65b154c7b5 100644 --- a/gerbview/CMakeLists.txt +++ b/gerbview/CMakeLists.txt @@ -60,6 +60,7 @@ set(GERBVIEW_EXTRA_SRCS if(WIN32) if(MINGW) + # GERBVIEW_RESOURCES variable is set by the macro. mingw_resource_compiler(gerbview) else(MINGW) set(GERBVIEW_RESOURCES gerbview.rc) diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt index d4a75adce9..2a11d9e4fd 100644 --- a/kicad/CMakeLists.txt +++ b/kicad/CMakeLists.txt @@ -15,6 +15,7 @@ set(KICAD_SRCS if(WIN32) if(MINGW) + # KICAD_RESOURCES variable is set by the macro. mingw_resource_compiler(kicad) else(MINGW) set(KICAD_RESOURCES kicad.rc) diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index deec9ff836..0c17ebdc24 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -151,6 +151,7 @@ set(PCBNEW_EXTRA_SRCS if(WIN32) if(MINGW) + # PCBNEW_RESOURCES variable is set by the macro. mingw_resource_compiler(pcbnew) else(MINGW) set(PCBNEW_RESOURCES pcbnew.rc)