From b6d91bd28ae36b4580fade90823fa8991158b572 Mon Sep 17 00:00:00 2001 From: Simon Richter Date: Sat, 2 May 2020 11:02:42 +0200 Subject: [PATCH] Remove commented-out code for building cvpcb.exe --- cvpcb/CMakeLists.txt | 71 -------------------------------------------- 1 file changed, 71 deletions(-) diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt index 42c7a4eed9..42d2708ebd 100644 --- a/cvpcb/CMakeLists.txt +++ b/cvpcb/CMakeLists.txt @@ -60,77 +60,6 @@ else() endif() -if( false ) - # setup bundle - set( CVPCB_RESOURCES cvpcb.icns cvpcb_doc.icns ) - set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.icns" PROPERTIES - MACOSX_PACKAGE_LOCATION Resources - ) - set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/cvpcb_doc.icns" PROPERTIES - MACOSX_PACKAGE_LOCATION Resources - ) - set( MACOSX_BUNDLE_ICON_FILE cvpcb.icns ) - set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad ) - set( MACOSX_BUNDLE_NAME cvpcb ) -endif() - - -if( false ) # no CVPCB exe any more, only the *.kiface - add_executable( cvpcb WIN32 MACOSX_BUNDLE - ../common/single_top.cpp - ../common/pgm_base.cpp - ${CVPCB_RESOURCES} - ) - set_source_files_properties( ../common/single_top.cpp PROPERTIES - COMPILE_DEFINITIONS "TOP_FRAME=FRAME_CVPCB;PGM_DATA_FILE_EXT=\"net\";BUILD_KIWAY_DLL" - ) - target_link_libraries( cvpcb - #singletop # replaces common, giving us restrictive control and link warnings. - # There's way too much crap coming in from common yet. - common - ${wxWidgets_LIBRARIES} - ) - if( MAKE_LINK_MAPS ) - set_target_properties( cvpcb PROPERTIES - LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=cvpcb.map" ) - endif() - - if( APPLE ) - include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake ) - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist @ONLY ) - - set_target_properties( cvpcb PROPERTIES - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist - ) - - # put individual bundle outside of main bundle as a first step - # will be pulled into the main bundle when creating main bundle - install( TARGETS cvpcb - DESTINATION ${KICAD_BIN} - COMPONENT binary - ) - install( CODE " - # override default embedded path settings - ${OSX_BUNDLE_OVERRIDE_PATHS} - - # do all the work - include( BundleUtilities ) - fixup_bundle( ${KICAD_BIN}/cvpcb.app/Contents/MacOS/cvpcb - \"\" - \"\" - ) - " COMPONENT Runtime - ) - else() - install( TARGETS cvpcb - DESTINATION ${KICAD_BIN} - COMPONENT binary - ) - endif() - -endif() # no CVPCB exe - - # the main cvpcb program, in DSO form. add_library( cvpcb_kiface MODULE cvpcb.cpp