tkurbad/tkurbad-overlay
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated libmed

Browse Source
This commit is contained in:
layman
2018-02-02 00:04:08 +01:00
parent a748ae043e
commit 9104bfd423
4 changed files with 129 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sci-libs/libmed/files/libmed-3.2.1-cmake-fortran.patch
+20
View File
@@ -0,0 +1,20 @@
Make cmake properly disable fortran upon user requirments
--- ./CMakeLists.txt.orig 2016-07-01 15:28:57.139304608 +0300
+++ ./CMakeLists.txt 2016-07-01 15:34:22.295899455 +0300
@@ -8,10 +8,13 @@
INCLUDE(CheckLanguage)
CHECK_LANGUAGE(Fortran)
-IF(CMAKE_Fortran_COMPILER)
+OPTION (MEDFILE_BUILD_FORTRAN "Build fortran library" ON)
+IF(MEDFILE_BUILD_FORTRAN)
ENABLE_LANGUAGE(Fortran)
+ IF(NOT CMAKE_Fortran_COMPILER)
+ MESSAGE(FATAL_EROOR "Fortran support was requested but not found")
+ ENDIF()
ELSE()
- MESSAGE(STATUS "No Fortran support")
ENDIF()
## Version number
sci-libs/libmed/files/libmed-3.2.1-disable-python-compile.patch
+16
View File
@@ -0,0 +1,16 @@
--- ./config/cmake_files/medMacros.cmake 2016-10-24 09:55:35.000000000 +0200
+++ ./config/cmake_files/medMacros.cmake.new 2018-01-24 10:50:15.146953227 +0100
@@ -412,9 +412,9 @@
FOREACH(input ${PYFILE2COMPINST})
GET_FILENAME_COMPONENT(inputname ${input} NAME)
INSTALL(FILES ${input} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYFILELOC})
- INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
- INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
+ #INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
+ #INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
+ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
+ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
ENDFOREACH(input ${PYFILE2COMPINST})
ENDMACRO(INSTALL_AND_COMPILE_PYTHON_FILE PYFILE2COMPINST PYFILELOC)