Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SpiceQL
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
aflab
astrogeology
SpiceQL
Commits
76293dff
Commit
76293dff
authored
1 year ago
by
Christine Kim
Browse files
Options
Downloads
Patches
Plain Diff
Update files for conda build
parent
5b47af7b
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-1
2 additions, 1 deletion
CMakeLists.txt
cmake/FindCereal.cmake
+1
-1
1 addition, 1 deletion
cmake/FindCereal.cmake
environment.yml
+2
-3
2 additions, 3 deletions
environment.yml
with
5 additions
and
5 deletions
CMakeLists.txt
+
2
−
1
View file @
76293dff
...
...
@@ -60,6 +60,7 @@ if(SPICEQL_BUILD_LIB)
find_package
(
fmt REQUIRED
)
find_package
(
cereal REQUIRED
)
find_package
(
spdlog REQUIRED
)
find_package
(
hiredis REQUIRED
)
set
(
SPICEQL_INSTALL_INCLUDE_DIR
"include/SpiceQL"
)
set
(
SPICEQL_SRC_FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/SpiceQL/src/spiceql.cpp
...
...
@@ -109,7 +110,7 @@ if(SPICEQL_BUILD_LIB)
target_compile_definitions
(
SpiceQL PRIVATE SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE
PUBLIC -D_SOURCE_PREFIX=
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
)
message
(
STATUS
"redis++ inc: "
${
hiredis
_INCLUDE_DIRS
}
)
message
(
STATUS
"redis++ inc: "
${
HIREDIS
_INCLUDE_DIRS
}
)
target_include_directories
(
SpiceQL
PUBLIC
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/SpiceQL/include>
...
...
This diff is collapsed.
Click to expand it.
cmake/FindCereal.cmake
+
1
−
1
View file @
76293dff
...
...
@@ -12,7 +12,7 @@ find_path(CEREAL_INCLUDE_DIR cereal
set
(
CEREAL_INCLUDE_DIRS
${
CEREAL_INCLUDE_DIR
}
)
include
(
FindPackageHandleStandardArgs
)
find_package_handle_standard_args
(
C
ereal DEFAULT_MSG CEREAL_INCLUDE_DIR
)
find_package_handle_standard_args
(
c
ereal DEFAULT_MSG CEREAL_INCLUDE_DIR
)
mark_as_advanced
(
CEREAL_INCLUDE_DIR
)
...
...
This diff is collapsed.
Click to expand it.
environment.yml
+
2
−
3
View file @
76293dff
...
...
@@ -2,14 +2,13 @@ channels:
-
defaults
-
conda-forge
-
usgs-astrogeology
-
tudat-team
dependencies
:
-
cmake
-
cspice
-
cpp-filesystem
-
doxygen
-
fmt
-
fmt
==9.1.0
-
libhiredis
-
ninja
-
pip
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment