|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
965356c |
From 0b090f4c0a38b794ae57416dcbff5db14b32a335 Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
Date: Tue, 1 Dec 2020 10:04:04 +0000
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
ff17f0f |
Subject: [PATCH 06/11] Do not generate version info at buildtime
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
---
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
965356c |
src/nrniv/CMakeLists.txt | 18 +-----------------
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
965356c |
1 file changed, 1 insertion(+), 17 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
diff --git a/src/nrniv/CMakeLists.txt b/src/nrniv/CMakeLists.txt
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
965356c |
index 3bedd62c0..13dc0f40b 100644
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
--- a/src/nrniv/CMakeLists.txt
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
+++ b/src/nrniv/CMakeLists.txt
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
965356c |
@@ -204,23 +204,7 @@ set(NRN_INCLUDE_DIRS
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
# =============================================================================
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
# Helper commands : generate various headers
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
# =============================================================================
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
-# ~~~
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
-# generate version information file
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
-# nrnversion.h does not depend on another file but on the output of
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
-# git2version_h.sh and nrnversion.h should only be changed if that output
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
-# is different from the contents of nrnversion.h
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
-# ~~~
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
-add_custom_target(
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
57d58b5 |
- nrnversion_h
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
965356c |
- COMMAND ${CMAKE_COMMAND} -E env PROJECT_VERSION=${PROJECT_VERSION} bash
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
965356c |
- ${PROJECT_SOURCE_DIR}/git2nrnversion_h.sh ${PROJECT_SOURCE_DIR} > nrnversion.h.tmp
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
- COMMAND ${CMAKE_COMMAND} -E copy_if_different nrnversion.h.tmp ${NRN_NRNOC_SRC_DIR}/nrnversion.h
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
- DEPENDS ${PROJECT_SOURCE_DIR}/git2nrnversion_h.sh)
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
-
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
-add_custom_command(OUTPUT ${NRN_NRNOC_SRC_DIR}/nrnversion.h DEPENDS nrnversion_h)
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
965356c |
-add_dependencies(generated_source_files nrnversion_h)
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
-
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
965356c |
-# avoid error with nvector_serial.cpp for #include <../../../nrnconf.h>
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
965356c |
+# avoid error with nvector_serial.c for #include <../../../nrnconf.h>
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/src/sundials/shared)
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
965356c |
# generate hocusr.h
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
--
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
965356c |
2.39.1
|
|
![](https://seccdn.libravatar.org/avatar/782cac864b311ac07269bbcb1ba21fda67bb5c7b6e6f004d3aafcb3f02392433?s=16&d=retro) |
4c00d82 |
|