Skip to content
Snippets Groups Projects
Commit ad2f10ca authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

use newest dependency zip, deactivate CERF_AS_CPP

parent 48315ff4
No related branches found
No related tags found
No related merge requests found
...@@ -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_200708.zip -O ${{runner.temp}}\dependencies.zip wget http://apps.jcns.fz-juelich.de/src/WinLibs/bornagain_deps_200709.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
......
...@@ -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)
......
# 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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment