haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Executable icon resource build configuration fixes. 

* The resource setting for bitmap2component is too late in the CMakeLists.txt,
  and is being ignored. Bitmap2component does not have an icon resource on
  Windows.  Moving the entire section resolves the issue.
* The other programs only have the mingw special case listed, not the generic
  declaration for the resource file so added them.
This commit is contained in:
Simon Richter 2016-01-28 11:53:24 -05:00 committed by Wayne Stambaugh
parent 75b1df464d
commit 23e8c3ebf3
8 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bitmap2component/CMakeLists.txt
View File

@ -20,6 +20,13 @@ set_source_files_properties( bitmap2cmp_gui.cpp PROPERTIES
COMPILE_DEFINITIONS "COMPILING_DLL" COMPILE_DEFINITIONS "COMPILING_DLL"
) )
if( MINGW )
# BITMAP2COMPONENT_RESOURCES variable is set by the macro.
mingw_resource_compiler( bitmap2component )
else()
set( BITMAP2COMPONENT_RESOURCES bitmap2component.rc )
endif()
if( APPLE ) if( APPLE )
# setup bundle # setup bundle
set( BITMAP2COMPONENT_RESOURCES bitmap2component.icns ) set( BITMAP2COMPONENT_RESOURCES bitmap2component.icns )
@ -80,11 +87,3 @@ if( false ) # linker map with cross reference
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=bitmap2component.map" LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=bitmap2component.map"
) )
endif() endif()
if( MINGW )
# BITMAP2COMPONENT_RESOURCES variable is set by the macro.
mingw_resource_compiler( bitmap2component )
else()
set( BITMAP2COMPONENT_RESOURCES bitmap2component.rc )
endif()

2
cvpcb/CMakeLists.txt
View File

@ -57,6 +57,8 @@ set( CVPCB_SRCS
if( MINGW ) if( MINGW )
# CVPCB_RESOURCES variable is set by the macro. # CVPCB_RESOURCES variable is set by the macro.
mingw_resource_compiler( cvpcb ) mingw_resource_compiler( cvpcb )
else()
set( CVPCB_RESOURCES cvpcb.rc )
endif() endif()

2
eeschema/CMakeLists.txt
View File

@ -197,6 +197,8 @@ set( EESCHEMA_COMMON_SRCS
if( MINGW ) if( MINGW )
# EESCHEMA_RESOURCES variable is set by the macro. # EESCHEMA_RESOURCES variable is set by the macro.
mingw_resource_compiler( eeschema ) mingw_resource_compiler( eeschema )
else()
set( EESCHEMA_RESOURCES eeschema.rc )
endif() endif()
# Create a C++ compilable string initializer containing html text into a *.h file: # Create a C++ compilable string initializer containing html text into a *.h file:

2
gerbview/CMakeLists.txt
View File

@ -78,6 +78,8 @@ set( GERBVIEW_EXTRA_SRCS
if( MINGW ) if( MINGW )
# GERBVIEW_RESOURCES variable is set by the macro. # GERBVIEW_RESOURCES variable is set by the macro.
mingw_resource_compiler( gerbview ) mingw_resource_compiler( gerbview )
else()
set( GERBVIEW_RESOURCES gerbview.rc )
endif() endif()
if( APPLE ) if( APPLE )

2
kicad/CMakeLists.txt
View File

@ -25,6 +25,8 @@ set( KICAD_SRCS
if( MINGW ) if( MINGW )
# KICAD_RESOURCES variable is set by the macro. # KICAD_RESOURCES variable is set by the macro.
mingw_resource_compiler( kicad ) mingw_resource_compiler( kicad )
else()
set( KICAD_RESOURCES kicad.rc )
endif() endif()
if( APPLE ) if( APPLE )

2
pagelayout_editor/CMakeLists.txt
View File

@ -50,6 +50,8 @@ set( PL_EDITOR_EXTRA_SRCS
if( MINGW ) if( MINGW )
# PL_EDITOR_RESOURCES variable is set by the macro. # PL_EDITOR_RESOURCES variable is set by the macro.
mingw_resource_compiler( pl_editor ) mingw_resource_compiler( pl_editor )
else()
set( PL_EDITOR_RESOURCES pl_editor.rc )
endif() endif()

2
pcb_calculator/CMakeLists.txt
View File

@ -40,6 +40,8 @@ set( PCB_CALCULATOR_SRCS
if( MINGW ) if( MINGW )
# PCB_CALCULATOR_RESOURCES variable is set by the macro. # PCB_CALCULATOR_RESOURCES variable is set by the macro.
mingw_resource_compiler( pcb_calculator ) mingw_resource_compiler( pcb_calculator )
else()
set( PCB_CALCULATOR_RESOURCES pcb_calculator.rc )
endif() endif()
if( APPLE ) if( APPLE )

2
pcbnew/CMakeLists.txt
View File

@ -499,6 +499,8 @@ endif()
if( MINGW ) if( MINGW )
# PCBNEW_RESOURCES variable is set by the macro. # PCBNEW_RESOURCES variable is set by the macro.
mingw_resource_compiler( pcbnew ) mingw_resource_compiler( pcbnew )
else()
set( PCBNEW_RESOURCES pcbnew.rc )
endif() endif()