Commit d98c4c8c authored by Michael Kuron's avatar Michael Kuron 💡
parent 7d53ae0d
Pipeline #2175 failed with stages
in 49 minutes and 45 seconds
......@@ -292,10 +292,20 @@ if(WITH_TESTS)
list(APPEND BOOST_COMPONENTS unit_test_framework)
endif()
find_package(Boost REQUIRED ${BOOST_COMPONENTS})
if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set(BOOST_MINIMUM_VERSION "1.65.0")
else()
set(BOOST_MINIMUM_VERSION "1.53.0")
endif()
find_package(Boost ${BOOST_MINIMUM_VERSION} REQUIRED ${BOOST_COMPONENTS})
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
list(APPEND LIBRARIES ${Boost_LIBRARIES})
if(Boost_VERSION VERSION_GREATER 106399 AND Boost_VERSION VERSION_LESS 106500)
message(FATAL_ERROR "Boost 1.64 is unsupported")
endif()
#######################################################################
# Paths
#######################################################################
......@@ -345,6 +355,10 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSI
# older versions don't support -Wno-pedantic which we need in src/python
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "16.0")
# workaround for compiler crash related to decltype() and variadic template usage inside Boost
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_NO_CXX11_VARIADIC_TEMPLATES")
endif()
set(CMAKE_MACOSX_RPATH TRUE)
......
......@@ -83,6 +83,8 @@ def check_myconfig(compiler, feature_file, myconfig, pre_header = None):
print("External feature '{}' can not be defined in myconfig.".format(e))
for u in (my_features - defs.features):
if u.startswith('__'):
continue
error_state = True
handle_unkown(u, defs.features)
......
......@@ -67,16 +67,16 @@ list(REMOVE_DUPLICATES cython_SRC)
foreach(cython_file ${cython_SRC})
get_filename_component(basename ${cython_file} NAME_WE)
file(RELATIVE_PATH relpath ${CMAKE_CURRENT_SOURCE_DIR} ${cython_file})
if("${basename}" STREQUAL "code_info")
if(basename STREQUAL "code_info")
file(RELATIVE_PATH relpath ${CMAKE_CURRENT_BINARY_DIR} ${cython_file})
endif()
get_filename_component(relpath ${relpath} DIRECTORY)
if("${relpath}" STREQUAL "")
if(relpath STREQUAL "")
string(CONCAT outputpath ${CMAKE_CURRENT_BINARY_DIR} "/" ${basename} ".cpp")
else()
string(CONCAT outputpath ${CMAKE_CURRENT_BINARY_DIR} "/" ${relpath} "/" ${basename} ".cpp")
endif()
if("${basename}" STREQUAL "")
if(basename STREQUAL "")
message( FATAL_ERROR "Internal error empty basename of file ${cython_file}")
else()
list(APPEND cython_generated_SRC "${basename}.cpp")
......
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