@@ -17,33 +17,42 @@ endif()
1717
1818list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR} )
1919
20+ # gersemi: off
2021# ---------------------------------------------------------------------------
2122# The CMAKE_EXPERIMENTAL_CXX_IMPORT_STD is not longer needed except for OSX
2223# ---------------------------------------------------------------------------
23- if (NOT BEMAN_USE_STD_MODULE OR CMAKE_VERSION VERSION_GREATER_EQUAL 4.3 )
24+ if (NOT BEMAN_USE_STD_MODULE OR CMAKE_VERSION VERSION_GREATER_EQUAL 4.4 )
2425 if (NOT APPLE )
2526 return ()
2627 endif ()
2728endif ()
2829# ---------------------------------------------------------------------------
2930
30- # gersemi: off
3131# ---------------------------------------------------------------------------
3232# check if import std; is supported by CMAKE_CXX_COMPILER
3333# ---------------------------------------------------------------------------
34- if (CMAKE_VERSION VERSION_GREATER_EQUAL 4.2 AND CMAKE_VERSION VERSION_LESS 4.3 )
34+ if (CMAKE_VERSION VERSION_GREATER_EQUAL 4.2 AND CMAKE_VERSION VERSION_LESS 4.4 )
3535 if (PROJECT_NAME )
3636 message (
3737 WARNING
3838 "This CMake file has to be included before first project() command call!"
3939 )
4040 endif ()
41+ endif ()
4142
43+ # ---------------------------------------------------------------------------
44+ # check if import std; is supported by CMAKE_CXX_COMPILER
45+ # ---------------------------------------------------------------------------
46+ if (CMAKE_VERSION VERSION_GREATER_EQUAL 4.3 AND CMAKE_VERSION VERSION_LESS 4.4)
47+ set (CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "451f2fe2-a8a2-47c3-bc32-94786d8fc91b" )
48+ elseif (CMAKE_VERSION VERSION_GREATER_EQUAL 4.2 AND CMAKE_VERSION VERSION_LESS 4.3)
4249 set (CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "d0edc3af-4c50-42ea-a356-e2862fe7a444" )
4350endif ()
4451# gersemi: on
4552
53+ # ---------------------------------------------------------------------------
4654# TODO(CK): Do we need this HACK still for linux too?
55+ # ---------------------------------------------------------------------------
4756if (NOT APPLE )
4857 return ()
4958endif ()
0 commit comments