-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add silo build support to build_ascent (#1342)
* wip build_ascent silo support * build ascent: add silo * defend against symlinks attacking windows * make a pattern, see * silo patch for windows * build_ascent: limit windows patch to windows * build_ascent wire silo support to conduit build * silo dlls loc for windows testing, build_ascent enable tests only wired to ascent proper * config check for silo support in conduit
- Loading branch information
Showing
4 changed files
with
127 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 0dc4a5b..fd6baaf 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -57,7 +57,9 @@ cmake_minimum_required(VERSION 3.12 FATAL_ERROR) | ||
### | ||
# grab the version string | ||
### | ||
-file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/VERSION SILO_VERSION) | ||
+file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/SILO_VERSION SILO_VERSION) | ||
+# Strip suffix | ||
+string(REGEX REPLACE "-.*" "" SILO_VERSION "${SILO_VERSION}") | ||
|
||
###----------------------------------------------------------------------------- | ||
# project command will automatically create cmake vars for major, minor, | ||
@@ -139,7 +141,9 @@ CMAKE_DEPENDENT_OPTION(SILO_ENABLE_HZIP "Enable Lindstrom hex/quad mesh compress | ||
## | ||
# Set up a default INSTALL prefix that is peer to the build directory | ||
## | ||
-set(CMAKE_INSTALL_PREFIX ${Silo_BINARY_DIR}/../SiloInstall CACHE PATH "install prefix" FORCE) | ||
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) | ||
+ set(CMAKE_INSTALL_PREFIX ${Silo_BINARY_DIR}/../SiloInstall CACHE PATH "install prefix" FORCE) | ||
+endif() |
10 changes: 10 additions & 0 deletions
10
scripts/build_ascent/2024_07_29_silo-pr389-win32-bugfix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
diff --git a/src/silo/silo_win32_compatibility.h b/src/silo/silo_win32_compatibility.h | ||
index bc4d38f..00b970c 100644 | ||
--- a/src/silo/silo_win32_compatibility.h | ||
+++ b/src/silo/silo_win32_compatibility.h | ||
@@ -1,4 +1,4 @@ | ||
-#ifdef WIN32 | ||
+#ifdef _WIN32 | ||
#ifndef SILO_WIN32_COMPATIBILITY | ||
#define SILO_WIN32_COMPATIBILITY | ||
#include <io.h> /* Include Windows IO * |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters