Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
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
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
ad2f10ca
Commit
ad2f10ca
authored
4 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
use newest dependency zip, deactivate CERF_AS_CPP
parent
48315ff4
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.github/workflows/ba-windows.yml
+1
-1
1 addition, 1 deletion
.github/workflows/ba-windows.yml
cmake/extensions/FindCerf.cmake
+1
-18
1 addition, 18 deletions
cmake/extensions/FindCerf.cmake
cmake/modules/SearchInstalledSoftware.cmake
+4
-0
4 additions, 0 deletions
cmake/modules/SearchInstalledSoftware.cmake
with
6 additions
and
19 deletions
.github/workflows/ba-windows.yml
+
1
−
1
View file @
ad2f10ca
...
@@ -59,7 +59,7 @@ jobs:
...
@@ -59,7 +59,7 @@ jobs:
cd ${{github.workspace}}
cd ${{github.workspace}}
mkdir deps
mkdir deps
Get-Date -Format G
Get-Date -Format G
wget http://apps.jcns.fz-juelich.de/src/WinLibs/bornagain_deps_20070
8
.zip -O ${{runner.temp}}\dependencies.zip
wget http://apps.jcns.fz-juelich.de/src/WinLibs/bornagain_deps_20070
9
.zip -O ${{runner.temp}}\dependencies.zip
Get-Date -Format G
Get-Date -Format G
7z x ${{runner.temp}}\dependencies.zip -odeps
7z x ${{runner.temp}}\dependencies.zip -odeps
Get-Date -Format G
Get-Date -Format G
...
...
This diff is collapsed.
Click to expand it.
cmake/extensions/FindCerf.cmake
+
1
−
18
View file @
ad2f10ca
...
@@ -16,7 +16,7 @@ set(Cerf_ULTIMATELY_REQUIRED ${Cerf_FIND_REQUIRED})
...
@@ -16,7 +16,7 @@ set(Cerf_ULTIMATELY_REQUIRED ${Cerf_FIND_REQUIRED})
set
(
Cerf_FIND_REQUIRED FALSE
)
set
(
Cerf_FIND_REQUIRED FALSE
)
find_path
(
Cerf_INCLUDE_DIR cerf.h
)
find_path
(
Cerf_INCLUDE_DIR cerf.h
)
find_library
(
Cerf_LIBRARIES NAMES cerf
)
find_library
(
Cerf_LIBRARIES NAMES cerf
libcerf
)
include
(
FindPackageHandleStandardArgs
)
include
(
FindPackageHandleStandardArgs
)
find_package_handle_standard_args
(
Cerf DEFAULT_MSG Cerf_LIBRARIES Cerf_INCLUDE_DIR
)
find_package_handle_standard_args
(
Cerf DEFAULT_MSG Cerf_LIBRARIES Cerf_INCLUDE_DIR
)
...
@@ -25,23 +25,6 @@ if(Cerf_FOUND)
...
@@ -25,23 +25,6 @@ if(Cerf_FOUND)
message
(
STATUS
"Found libcerf, version
${
Cerf_VERSION
}
, lib=
${
Cerf_LIBRARIES
}
,\
message
(
STATUS
"Found libcerf, version
${
Cerf_VERSION
}
, lib=
${
Cerf_LIBRARIES
}
,\
include_dir=
${
Cerf_INCLUDE_DIR
}
."
)
include_dir=
${
Cerf_INCLUDE_DIR
}
."
)
set
(
Cerf_IS_CPP OFF
)
set
(
Cerf_IS_CPP OFF
)
else
()
unset
(
Cerf_FOUND
)
unset
(
Cerf_LIBRARIES
)
find_library
(
Cerf_LIBRARIES NAMES cerfcpp
)
find_package_handle_standard_args
(
Cerf DEFAULT_MSG Cerf_LIBRARIES Cerf_INCLUDE_DIR
)
if
(
NOT Cerf_FOUND
)
message
(
STATUS
"libcerf: FOUND=
${
Cerf_FOUND
}
, VERSION=
${
Cerf_VERSION
}
, "
"LIB=
${
Cerf_LIBRARIES
}
, IS_CPP=
${
Cerf_IS_CPP
}
"
)
if
(
${
Cerf_ULTIMATELY_REQUIRED
}
)
message
(
FATAL_ERROR
"Found neither libcerf nor libcerfcpp"
)
endif
()
message
(
STATUS
"Found neither libcerf nor libcerfcpp"
)
return
()
endif
()
message
(
STATUS
"Found libcerfcpp, version
${
Cerf_VERSION
}
, lib=
${
Cerf_LIBRARIES
}
,\
include_dir=
${
Cerf_INCLUDE_DIR
}
."
)
set
(
Cerf_IS_CPP ON
)
endif
()
endif
()
mark_as_advanced
(
Cerf_INCLUDE_DIR Cerf_LIBRARIES
)
mark_as_advanced
(
Cerf_INCLUDE_DIR Cerf_LIBRARIES
)
...
...
This diff is collapsed.
Click to expand it.
cmake/modules/SearchInstalledSoftware.cmake
+
4
−
0
View file @
ad2f10ca
# Search for installed software required by BornAgain
# Search for installed software required by BornAgain
if
(
WIN32
)
set
(
CMAKE_FIND_LIBRARY_SUFFIXES .dll.a .lib
)
endif
()
find_package
(
Threads REQUIRED
)
find_package
(
Threads REQUIRED
)
find_package
(
FFTW3 REQUIRED
)
find_package
(
FFTW3 REQUIRED
)
find_package
(
GSL REQUIRED
)
find_package
(
GSL REQUIRED
)
...
...
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