forked from spack/spack
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
exago: Add v1.2.0 and patches for builds without python or tests. (sp…
…ack#41350) Co-authored-by: Satish Balay <[email protected]>
- Loading branch information
1 parent
cbc8e7f
commit 9017195
Showing
4 changed files
with
104 additions
and
0 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,21 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index d0e8ed18..3225509c 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -366,10 +366,13 @@ else() | ||
endif() | ||
endif() | ||
|
||
-include(ExaGOCheckPython) | ||
if(EXAGO_ENABLE_PYTHON) | ||
+ include(ExaGOCheckPython) | ||
add_subdirectory(interfaces/python) | ||
endif() | ||
|
||
-# Build tests | ||
-add_subdirectory(tests) | ||
+if(EXAGO_RUN_TESTS) | ||
+ # Build tests | ||
+ add_subdirectory(tests) | ||
+endif() | ||
+ |
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,37 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 7d6ef668..7a1c4702 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -222,11 +222,13 @@ endif(EXAGO_ENABLE_GPU) | ||
if(EXAGO_ENABLE_PETSC) | ||
include(FindPkgConfig) | ||
# Include petsc package path in pkg_config_path | ||
+ set(PKG_CONFIG_PATH_save $ENV{PKG_CONFIG_PATH}) | ||
set(ENV{PKG_CONFIG_PATH} | ||
${PETSC_DIR}/lib/pkgconfig:${PETSC_DIR}/${PETSC_ARCH}/lib/pkgconfig | ||
) | ||
pkg_check_modules(PETSC REQUIRED IMPORTED_TARGET PETSc) | ||
set(EXAGO_HAVE_PETSC 1) | ||
+ set(ENV{PKG_CONFIG_PATH} ${PKG_CONFIG_PATH_save}) | ||
endif() | ||
|
||
# Set install rpath to the locations where EXAGO and PETSc libraries reside. | ||
@@ -394,12 +396,15 @@ else() | ||
endif() | ||
endif() | ||
|
||
-include(ExaGOCheckPython) | ||
if(EXAGO_ENABLE_PYTHON) | ||
+ include(ExaGOCheckPython) | ||
# Build pybind11 target manually | ||
add_subdirectory(tpl/pybind11) | ||
add_subdirectory(interfaces/python) | ||
endif() | ||
|
||
-# Build tests | ||
-add_subdirectory(tests) | ||
+if(EXAGO_RUN_TESTS) | ||
+ # Build tests | ||
+ add_subdirectory(tests) | ||
+endif() | ||
+ |
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,39 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index ba8e145f..89dd3327 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -217,11 +217,13 @@ endif(EXAGO_ENABLE_GPU) | ||
if(EXAGO_ENABLE_PETSC) | ||
include(FindPkgConfig) | ||
# Include petsc package path in pkg_config_path | ||
+ set(PKG_CONFIG_PATH_save $ENV{PKG_CONFIG_PATH}) | ||
set(ENV{PKG_CONFIG_PATH} | ||
${PETSC_DIR}/lib/pkgconfig:${PETSC_DIR}/${PETSC_ARCH}/lib/pkgconfig | ||
) | ||
pkg_check_modules(PETSC REQUIRED IMPORTED_TARGET PETSc) | ||
set(EXAGO_HAVE_PETSC 1) | ||
+ set(ENV{PKG_CONFIG_PATH} ${PKG_CONFIG_PATH_save}) | ||
endif() | ||
|
||
# Set install rpath to the locations where EXAGO and PETSc libraries reside. | ||
@@ -392,15 +394,17 @@ else() | ||
endif() | ||
endif() | ||
|
||
-include(ExaGOCheckPython) | ||
if(EXAGO_ENABLE_PYTHON) | ||
+ include(ExaGOCheckPython) | ||
# Build pybind11 target manually | ||
add_subdirectory(tpl/pybind11) | ||
add_subdirectory(interfaces/python) | ||
endif() | ||
|
||
-# Build tests | ||
-add_subdirectory(tests) | ||
+if(EXAGO_RUN_TESTS) | ||
+ # Build tests | ||
+ add_subdirectory(tests) | ||
+endif() | ||
|
||
if((NOT EXAGO_ENABLE_IPOPT) AND (NOT EXAGO_ENABLE_HIOP)) | ||
message( |
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