Skip to content

Commit

Permalink
bump version of SpecUtils
Browse files Browse the repository at this point in the history
  • Loading branch information
wcjohns committed Apr 15, 2023
1 parent bc871ca commit cbd9b60
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion external_libs/SpecUtils
4 changes: 4 additions & 0 deletions src/LeafletRadMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ std::string LeafletRadMap::get_user_arcgis_key()

if( !SpecUtils::is_file( user_key_file ) )
{
#if( BUILD_AS_ELECTRON_APP || BUILD_AS_OSX_APP || BUILD_AS_WX_WIDGETS_APP )
try
{
const string app_data_dir = InterSpec::staticDataDirectory();
Expand All @@ -286,6 +287,9 @@ std::string LeafletRadMap::get_user_arcgis_key()
// This error would have already been reported to the user on application startup.
return "";
}
#else
return "";
#endif
}else
{
std::vector<char> data;
Expand Down
2 changes: 1 addition & 1 deletion target/electron/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ npm install electron-packager
# Since we are are building a shared library Electron will load, we will compile shared libraries
# to link against the static gcc libraries.
# This command may take a long time to run.
CMAKE_BUILD_PARALLEL_LEVEL=12 cmake-js --architecture x64 --arch=x64 --CDCMAKE_BUILD_TYPE="Release" --CDInterSpec_FETCH_DEPENDENCIES=ON --CDBUILD_AS_LOCAL_SERVER=OFF --CDCMAKE_SHARED_LINKER_FLAGS="-static-libgcc -static-libstdc++" --CDUSE_LEAFLET_MAP=ON --CDLEAFLET_MAPS_KEY="..." --CDUSE_REL_ACT_TOOL=ON --out=build_manylinux_electron --target install
CMAKE_BUILD_PARALLEL_LEVEL=6 cmake-js --architecture x64 --arch=x64 --CDCMAKE_BUILD_TYPE="Release" --CDInterSpec_FETCH_DEPENDENCIES=ON --CDBUILD_AS_LOCAL_SERVER=OFF --CDCMAKE_SHARED_LINKER_FLAGS="-static-libgcc -static-libstdc++" --CDUSE_LEAFLET_MAP=ON --CDLEAFLET_MAPS_KEY="..." --CDUSE_REL_ACT_TOOL=ON --out=build_manylinux_electron --target install

npm run package-manylinux
cp ../../NOTICE.html ./release-builds/InterSpec-linux-x64/
Expand Down

0 comments on commit cbd9b60

Please sign in to comment.