|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
From c15b406e3ca409795affef95f1faab7a6a48443e Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
Date: Sun, 5 Apr 2020 12:31:39 +0100
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
Subject: [PATCH 5/5] Disable pyinstall
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
---
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
pysteps/CMakeLists.txt | 23 -----------------------
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
1 file changed, 23 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
diff --git a/pysteps/CMakeLists.txt b/pysteps/CMakeLists.txt
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
index de83408..f018ba0 100644
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
--- a/pysteps/CMakeLists.txt
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
+++ b/pysteps/CMakeLists.txt
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
@@ -54,28 +54,5 @@ set_target_properties(cysteps
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
OUTPUT_NAME
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
${cymodname})
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
-# Pure python package
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
-add_custom_target(steps_package_pure_py ALL
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- DEPENDS ${steps_package_timestamp}) # random file bridging
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- # target->command
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
-add_custom_command(OUTPUT ${steps_package_timestamp}
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- COMMAND ${PYTHON_EXECUTABLE} ${setup_py} build
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- --build-base=${CMAKE_BINARY_DIR} install
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- --install-lib "${libdir}"
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- --no-compile
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- --force
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- COMMAND ${CMAKE_COMMAND} -E touch ${steps_package_timestamp}
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- # setup.py already tracks changed .py files. We set
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- # DEPENDS just to set the order: copy .py after
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- # building the lib
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- DEPENDS cysteps)
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
-
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
# Install compiled lib
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
install(TARGETS cysteps LIBRARY DESTINATION "${PYTHON_INSTALL_PREFIX}/steps/")
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
-
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
-# Install python package, from cmake_setup.py
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
-install(
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- CODE
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${setup_py} build --build-base=${CMAKE_BINARY_DIR} install --install-lib=${PYTHON_INSTALL_PREFIX} --force WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})"
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
- )
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
--
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
2.26.0
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
67b3300 |
|