Commit a2069976 authored by juan rodriguez-carvajal's avatar juan rodriguez-carvajal
Browse files

Merge branch 'testing-fpm' of https://code.ill.fr/scientific-software/crysfml into testing-fpm

parents 4c1c18d2 f5541295
Pipeline #13522 failed with stages
in 2 minutes and 48 seconds
......@@ -95,6 +95,7 @@ make:windows_ifort:
stage: make
script:
- call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
- call "C:\\Program Files (x86)\\IntelSWTools\\compilers_and_libraries_2020.2.254\\windows\\bin\\ifortvars.bat" intel64
- set PATH=c:\Projects\fullprof\python37\;C:\\Projects\\fullprof\\hdf5-ifort\\bin;%PATH%
- set LIB="C:\\Program Files (x86)\\IntelSWTools\\compilers_and_libraries_2020.2.254\\windows\\compiler\\lib\\intel64_win";%LIB%
- set HDF5_INCLUDE_PATH=C:\\Projects\\fullprof\\hdf5-ifort\\include\\shared
......@@ -168,6 +169,7 @@ make_release:windows:
stage: make_release
script:
- call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
- call "C:\\Program Files (x86)\\IntelSWTools\\compilers_and_libraries_2020.2.254\\windows\\bin\\ifortvars.bat" intel64
- set PATH=c:\Projects\fullprof\python37\;C:\\Projects\\fullprof\\hdf5-ifort\\bin;%PATH%
- set LIB="C:\\Program Files (x86)\\IntelSWTools\\compilers_and_libraries_2020.2.254\\windows\\compiler\\lib\\intel64_win";%LIB%
- set HDF5_INCLUDE_PATH=C:\\Projects\\fullprof\\hdf5-ifort\\include\\shared
......
......@@ -2,6 +2,8 @@ include(LibFindMacros)
get_filename_component(COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME_WE)
message("COMPILER_NAME " ${COMPILER_NAME})
set(WINTERACTER "$ENV{WINTERACTER}")
set(WINTER "$ENV{WINTER}")
set(WINT "$ENV{WINT}")
......@@ -164,7 +166,12 @@ elseif(APPLE)
else()
# Linux
if(COMPILER_NAME STREQUAL ifort)
message("Linux Winteracter cmake Find Macros")
message("WINTERACTER " ${WINTERACTER})
if (COMPILER_NAME STREQUAL ifort)
message("ifort")
find_path(WINTERACTER_MOD_DIR
NAMES winteracter.mod
......@@ -175,10 +182,17 @@ else()
${HOME}/lib.i64
/usr/local/lib/wint/lib.i64
/usr/lib/wint/lib.i64
/opt/lib/wint/lib.i64)
/opt/lib/wint/lib.i64
/users/ci/projects/fullprof/wint13/lib.i64
NO_CACHE
)
message("WINTERACTER_MOD_DIR " ${WINTERACTER_MOD_DIR})
elseif(COMPILER_NAME STREQUAL gfortran)
message("gfortran")
find_path(WINTERACTER_MOD_DIR
NAMES winteracter.mod
PATHS ${WINTERACTER}/lib.gnu64/8.3
......@@ -190,6 +204,10 @@ else()
/usr/lib/wint/lib.gnu64/8.3
/opt/lib/wint/lib.gnu64/8.3)
else()
message("compiler not recognized " ${COMPILER_NAME})
endif()
#libfind_library(XM Xm)
......@@ -214,9 +232,16 @@ else()
find_library(FONTCONFIG_LIBRARY NAMES fontconfig PATHS ENV LD_LIBRARY_PATH)
find_library(XINERAMA_LIBRARY NAMES Xinerama PATHS ENV LD_LIBRARY_PATH)
find_library(WINTERACTER_LIBRARY NAMES winter wint PATHS ${WINTERACTER_MOD_DIR})
find_library(WINTGL_LIBRARY NAMES winterGL wintGL PATHS ${WINTERACTER_MOD_DIR})
find_library(WINTERACTER_LIBRARY
NAMES winter wint
PATHS ${WINTERACTER_MOD_DIR}
${WINTERACTER}/lib.i64
ENV LD_LIBRARY_PATH)
find_library(WINTGL_LIBRARY
NAMES winterGL wintGL
PATHS ${WINTERACTER_MOD_DIR} ${WINTERACTER}/lib.i64
ENV LD_LIBRARY_PATH)
set(WINTERACTER_PROCESS_MODS WINTERACTER_MOD_DIR)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment