diff options
| author | Daniil Kazantsev <dkazanc@hotmail.com> | 2018-05-01 10:03:16 +0100 |
|---|---|---|
| committer | Daniil Kazantsev <dkazanc@hotmail.com> | 2018-05-01 10:03:16 +0100 |
| commit | fa47bdc29ba4178254531174c02f790a9d10a187 (patch) | |
| tree | b51d9cc53870eda6284f621ed0a4683c2d6b4d2f | |
| parent | 09eb48ffbb4ad699e2eefd25678e10dc59d6a177 (diff) | |
| download | regularization-fa47bdc29ba4178254531174c02f790a9d10a187.tar.gz regularization-fa47bdc29ba4178254531174c02f790a9d10a187.tar.bz2 regularization-fa47bdc29ba4178254531174c02f790a9d10a187.tar.xz regularization-fa47bdc29ba4178254531174c02f790a9d10a187.zip | |
make updates
| -rw-r--r-- | Core/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | Wrappers/Python/CMakeLists.txt | 5 |
2 files changed, 3 insertions, 21 deletions
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt index 322732b..86d69b2 100644 --- a/Core/CMakeLists.txt +++ b/Core/CMakeLists.txt @@ -24,15 +24,6 @@ if (PYTHONINTERP_FOUND) endif() endif() -#find_package(Boost REQUIRED -# COMPONENTS ${BOOST_PYTHON} ${BOOST_NUMPY}) -# -#if (Boost_FOUND) -# message("Boost version " ${Boost_VERSION}) -# message("Boost include dir " ${Boost_INCLUDE_DIRS}) -# message("Boost library dir " ${Boost_LIBRARY_DIRS}) -# message("Boost libraries " ${Boost_LIBRARIES}) -#endif() find_package(OpenMP) if (OPENMP_FOUND) @@ -85,7 +76,7 @@ message("Adding regularisers as a shared library") add_library(cilreg SHARED ${CMAKE_CURRENT_SOURCE_DIR}/regularisers_CPU/FGP_TV_core.c ${CMAKE_CURRENT_SOURCE_DIR}/regularisers_CPU/SB_TV_core.c - ${CMAKE_CURRENT_SOURCE_DIR}/regularisers_CPU/Diffusion_core.c + ${CMAKE_CURRENT_SOURCE_DIR}/regularisers_CPU/Diffusion_core.c #${CMAKE_CURRENT_SOURCE_DIR}/regularisers_CPU/LLT_model_core.c #${CMAKE_CURRENT_SOURCE_DIR}/regularisers_CPU/PatchBased_Regul_core.c #${CMAKE_CURRENT_SOURCE_DIR}/regularisers_CPU/TGV_PD_core.c @@ -100,7 +91,8 @@ target_link_libraries(cilreg ${EXTRA_LIBRARIES} ) include_directories(cilreg PUBLIC ${LIBRARY_INC}/include ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/regularisers_CPU/ ) + ${CMAKE_CURRENT_SOURCE_DIR}/regularisers_CPU/ + ${CMAKE_CURRENT_SOURCE_DIR}/inpainters_CPU/ ) #GENERATE_EXPORT_HEADER( cilreg # BASE_NAME cilreg # EXPORT_MACRO_NAME CCPiCore_EXPORTS @@ -155,8 +147,3 @@ if (CUDA_FOUND) else() message("CUDA NOT FOUND") endif() - - -#add_executable(regulariser_test ${CMAKE_CURRENT_SOURCE_DIR}/test/test_regulariser.cpp) - -#target_link_libraries (regulariser_test LINK_PUBLIC regularisers_lib) diff --git a/Wrappers/Python/CMakeLists.txt b/Wrappers/Python/CMakeLists.txt index fb00706..7833b54 100644 --- a/Wrappers/Python/CMakeLists.txt +++ b/Wrappers/Python/CMakeLists.txt @@ -81,8 +81,3 @@ else() endif() configure_file("setup-regularisers.py.in" "setup-regularisers.py") - - -#add_executable(regulariser_test ${CMAKE_CURRENT_SOURCE_DIR}/test/test_regulariser.cpp) - -#target_link_libraries (regulariser_test LINK_PUBLIC regularisers_lib) |