summaryrefslogtreecommitdiffstats
path: root/Wrappers
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2018-08-15 09:10:52 +0100
committerEdoardo Pasca <edo.paskino@gmail.com>2018-08-15 09:10:52 +0100
commit50739856921f8aeb980f790724b5117308bf9b0e (patch)
tree156f47a438c518a670ff0e78a855ca9fe2489a07 /Wrappers
parent20f82364390ed7a9cdd544ac2e9ad42779abbe70 (diff)
downloadregularization-50739856921f8aeb980f790724b5117308bf9b0e.tar.gz
regularization-50739856921f8aeb980f790724b5117308bf9b0e.tar.bz2
regularization-50739856921f8aeb980f790724b5117308bf9b0e.tar.xz
regularization-50739856921f8aeb980f790724b5117308bf9b0e.zip
install into MATLAB_DEST dir if WIN32
Diffstat (limited to 'Wrappers')
-rwxr-xr-xWrappers/Matlab/CMakeLists.txt10
-rw-r--r--Wrappers/Python/CMakeLists.txt11
2 files changed, 3 insertions, 18 deletions
diff --git a/Wrappers/Matlab/CMakeLists.txt b/Wrappers/Matlab/CMakeLists.txt
index 837993d..0c26148 100755
--- a/Wrappers/Matlab/CMakeLists.txt
+++ b/Wrappers/Matlab/CMakeLists.txt
@@ -2,13 +2,7 @@ project(regulariserMatlab)
find_package(Matlab REQUIRED COMPONENTS MAIN_PROGRAM MX_LIBRARY ENG_LIBRARY )
-set(MATLAB_DEST_DIR "" CACHE PATH "Directory of the Matlab wrappers")
-if (MATLAB_DEST_DIR)
-set(MATLAB_DEST "${MATLAB_DEST_DIR}")
-else()
-set(MATLAB_DEST "${CMAKE_INSTALL_PREFIX}/matlab")
-endif()
-message(STATUS "Matlab wrappers will be installed in " ${MATLAB_DEST})
+
#C:\Users\ofn77899\Documents\Projects\CCPi\GitHub\CCPi-FISTA_Reconstruction\Core\regularisers_CPU
@@ -148,6 +142,6 @@ message("number of GPU files " ${num})
endforeach()
add_custom_target(MatlabWrapperGPU DEPENDS ${GPU_MEX_TARGETS})
-
+
endif()
endif()
diff --git a/Wrappers/Python/CMakeLists.txt b/Wrappers/Python/CMakeLists.txt
index 68768bc..d86d0ea 100644
--- a/Wrappers/Python/CMakeLists.txt
+++ b/Wrappers/Python/CMakeLists.txt
@@ -16,16 +16,7 @@ find_package(PythonInterp REQUIRED)
if (PYTHONINTERP_FOUND)
message ("Current Python " ${PYTHON_VERSION_STRING} " found " ${PYTHON_EXECUTABLE})
endif()
-if (CONDA_BUILD)
-else()
-set(PYTHON_DEST_DIR "" CACHE PATH "Directory of the Matlab wrappers")
- if (PYTHON_DEST_DIR)
- set(PYTHON_DEST "${PYTHON_DEST_DIR}")
- else()
- set(PYTHON_DEST "${CMAKE_INSTALL_PREFIX}/python")
- endif()
- message(STATUS "Python wrappers will be installed in " ${PYTHON_DEST})
-endif()
+
## Build the regularisers package as a library
message("Creating Regularisers as shared library")