Skip to content

Use more modern CMake #1022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 11, 2024
Merged

Use more modern CMake #1022

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
231db95
Use `add_compile_options(...)` and `add_link_options(...)` instead of…
ACSimon33 Jun 5, 2024
0af92d8
Bump minimum CMake version to 3.13
ACSimon33 Jun 5, 2024
fe5c252
Set minimum CMake version for `INDEX64_EXT_API` to 3.18 due to the ne…
ACSimon33 Jun 5, 2024
d638ddb
Disable `BUILD_INDEX64_EXT_API` by default if the CMake version is le…
ACSimon33 Jun 5, 2024
7159cfb
Fix Intel compiler flags which contain a space
ACSimon33 Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix Intel compiler flags which contain a space
  • Loading branch information
@ACSimon33
ACSimon33 committed Jun 11, 2024
commit 7159cfb377c9855bbc2eab0c7027c907b2e9d310
4 changes: 2 additions & 2 deletions CMAKE/CheckLAPACKCompilerFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ macro(CheckLAPACKCompilerFlags)
if(WIN32)
set(FOPT_ILP64 /integer-size:64)
else()
set(FOPT_ILP64 "-integer-size 64")
set(FOPT_ILP64 "SHELL:-integer-size 64")
endif()
elseif((CMAKE_Fortran_COMPILER_ID STREQUAL "VisualAge") OR # CMake 2.6
(CMAKE_Fortran_COMPILER_ID STREQUAL "XL")) # CMake 2.8
Expand Down Expand Up @@ -61,7 +61,7 @@ macro(CheckLAPACKCompilerFlags)

add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-recursive>")
if(UNIX)
add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-fp-model strict>")
add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fp-model strict>")
endif()

# SunPro F95
Expand Down
2 changes: 1 addition & 1 deletion TESTING/MATGEN/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ if(BUILD_INDEX64_EXT_API)
endforeach()
file(COPY matgen_64.h DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${TMGLIB}_64_obj)
add_library(${TMGLIB}_64_obj OBJECT ${SOURCES_64})
target_compile_options(${TMGLIB}_64_obj PRIVATE ${FOPT_ILP64} -DMATGEN_64)
target_compile_options(${TMGLIB}_64_obj PRIVATE "${FOPT_ILP64}" -DMATGEN_64)
set_target_properties(
${TMGLIB}_64_obj PROPERTIES
POSITION_INDEPENDENT_CODE ON
Expand Down