From 9b7ef20be973294d5ed9d6e29b6d9d38c65f5996 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 22 Dec 2014 12:55:33 +0100 Subject: [PATCH] Fix install issue after removing freeroute.jnl, now useless because freeroute is no more accessible via the web. (Kicad is still able to run freeroute if freeroute.jar is accessible) add wxWidgets-3.0.2 folder detection in FindwxWidgets.cmake --- CMakeLists.txt | 4 ---- CMakeModules/FindwxWidgets.cmake | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 11cd04d401..0c7b062472 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -803,10 +803,6 @@ install( FILES INSTALL.txt DESTINATION ${KICAD_DOCS} COMPONENT resources ) -install( FILES resources/freeroute.jnlp - DESTINATION ${KICAD_BIN} - COMPONENT resources ) - ### # Install scripts ### diff --git a/CMakeModules/FindwxWidgets.cmake b/CMakeModules/FindwxWidgets.cmake index 9c7228fe0b..b93035deac 100644 --- a/CMakeModules/FindwxWidgets.cmake +++ b/CMakeModules/FindwxWidgets.cmake @@ -448,6 +448,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") D:/ $ENV{ProgramFiles} PATH_SUFFIXES + wxWidgets-3.0.2 wxWidgets-3.0.1 wxWidgets-3.0.0 wxWidgets-2.9.5