From c74437a44e4848147a6aca8954905039f8276f65 Mon Sep 17 00:00:00 2001 From: Nick ?stergaard Date: Fri, 1 Dec 2017 20:21:20 +0100 Subject: [PATCH] Remove unused custom cmake target This target seems to only create empty makefiles, tested on linux. And I can not find any references to it in any of the current CMakeLists. Lets remove it. --- CMakeLists.txt | 10 ---------- common/CMakeLists.txt | 6 ------ pcbnew/CMakeLists.txt | 4 ---- polygon/CMakeLists.txt | 2 -- 4 files changed, 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 565508c893..c70a34237f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -513,16 +513,6 @@ include( ${wxWidgets_USE_FILE} ) # find_package( OpenGL REQUIRED ) -# Dick 5-Feb-2014: -# Marco: We cannot use both ExternalProject_Add() add and find_package() -# in the same CMake tree and have them both reference the same package: -# http://stackoverflow.com/questions/6351609/cmake-linking-to-library-downloaded-from-externalproject-add -# https://www.mail-archive.com/cmake@cmake.org/msg47501.html - -# Handle target used to specify if a target needs wx-widgets or other libraries -# Always defined, empty if no libraries are to be built -add_custom_target( lib-dependencies ) - # # Find GLEW library, required # diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index f4ff414696..cb7281846f 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -64,7 +64,6 @@ set( GAL_SRCS ) add_library( gal STATIC ${GAL_SRCS} ) -add_dependencies( gal lib-dependencies ) target_link_libraries( gal ${GLEW_LIBRARIES} @@ -353,7 +352,6 @@ set( COMMON_SRCS libeval/numeric_evaluator.cpp ) add_library( common STATIC ${COMMON_SRCS} ) -add_dependencies( common lib-dependencies ) add_dependencies( common version_header ) target_link_libraries( common gal @@ -436,8 +434,6 @@ set_source_files_properties( ${PCB_COMMON_SRCS} PROPERTIES ) add_library( pcbcommon STATIC ${PCB_COMMON_SRCS} ) -add_dependencies( pcbcommon lib-dependencies ) - # auto-generate netlist_lexer.h and netlist_keywords.cpp make_lexer( @@ -541,8 +537,6 @@ add_dependencies( common page_layout_lexer_source_files ) add_executable( dsntest EXCLUDE_FROM_ALL dsnlexer.cpp ) target_link_libraries( dsntest common ${wxWidgets_LIBRARIES} rt ) -add_dependencies( dsntest lib-dependencies ) - target_link_libraries( pcbcommon ) diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index aa1886f250..d1b78b2e8e 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -574,7 +574,6 @@ add_subdirectory( pcad2kicadpcb_plugin ) if( BUILD_GITHUB_PLUGIN ) add_subdirectory( github ) - add_dependencies( github_plugin lib-dependencies ) # github_plugin depends on make_lexer outputs in common add_dependencies( github_plugin pcbcommon ) endif() @@ -715,9 +714,6 @@ else() ) endif() -add_dependencies( pcbnew lib-dependencies ) - - if( KICAD_SCRIPTING ) if( NOT APPLE ) install( FILES ${CMAKE_BINARY_DIR}/pcbnew/pcbnew.py DESTINATION ${PYTHON_DEST} ) diff --git a/polygon/CMakeLists.txt b/polygon/CMakeLists.txt index afa51cfe57..cd5959ef31 100644 --- a/polygon/CMakeLists.txt +++ b/polygon/CMakeLists.txt @@ -17,5 +17,3 @@ set(POLYGON_SRCS add_library(polygon STATIC ${POLYGON_SRCS}) -add_dependencies( polygon lib-dependencies ) -