From 3ddd287004f3ff6e189008266a94e3876b984bc0 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Wed, 22 Jun 2022 14:11:59 -0700 Subject: [PATCH] Revert "Fixup python module install" This reverts commit 6fd60c55611a0182b31fd9041615f896bd7c5dbf. Worked only for a single make. Second run fails due to missing file --- CMakeLists.txt | 2 +- pcbnew/CMakeLists.txt | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1410c52e01..7ffcf669cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # -cmake_minimum_required( VERSION 3.16 FATAL_ERROR ) +cmake_minimum_required( VERSION 3.12 FATAL_ERROR ) # Default to CMAKE_BUILD_TYPE = Release unless overridden on command line # http://www.cmake.org/pipermail/cmake/2008-September/023808.html diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 13b8791ae0..82de09f3ff 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -829,13 +829,7 @@ elseif( APPLE ) add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingPythonDirectoryCreation ) set( PYMOD_EXT "so" ) else() # only linux remains among supported platforms - install( TARGETS pcbnew_kiface DESTINATION ${PYTHON_DEST} COMPONENT binary ) - cmake_policy(SET CMP0087 NEW) - install( CODE - "file( RENAME - \$ENV{DESTDIR}${PYTHON_DEST}/\$ - \$ENV{DESTDIR}${PYTHON_DEST}/_pcbnew.so - )" ) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.kiface DESTINATION ${PYTHON_DEST} COMPONENT binary RENAME "_pcbnew.so" ) set( PYMOD_EXT "so" ) endif()