|
 |
f494256 |
diff -up scalapack-2.2.0/scalapack-2.2.0/BLACS/INSTALL/CMakeLists.txt.picfix scalapack-2.2.0/scalapack-2.2.0/BLACS/INSTALL/CMakeLists.txt
|
|
|
f494256 |
--- scalapack-2.2.0/scalapack-2.2.0/BLACS/INSTALL/CMakeLists.txt.picfix 2022-03-19 09:36:24.691840631 -0400
|
|
|
f494256 |
+++ scalapack-2.2.0/scalapack-2.2.0/BLACS/INSTALL/CMakeLists.txt 2022-03-19 09:36:33.501891327 -0400
|
|
|
f494256 |
@@ -2,3 +2,4 @@ cmake_minimum_required(VERSION 2.8)
|
|
|
f494256 |
project(INSTALL C Fortran)
|
|
|
f494256 |
|
|
|
f494256 |
add_executable(xintface Fintface.f Cintface.c)
|
|
|
f494256 |
+set_property(TARGET xintface PROPERTY POSITION_INDEPENDENT_CODE TRUE)
|
|
|
f494256 |
diff -up scalapack-2.2.0/scalapack-2.2.0/CMakeLists.txt.picfix scalapack-2.2.0/scalapack-2.2.0/CMakeLists.txt
|
|
|
f494256 |
--- scalapack-2.2.0/scalapack-2.2.0/CMakeLists.txt.picfix 2022-03-19 09:36:42.285941877 -0400
|
|
|
f494256 |
+++ scalapack-2.2.0/scalapack-2.2.0/CMakeLists.txt 2022-03-19 09:37:25.964193237 -0400
|
|
|
f494256 |
@@ -110,6 +110,21 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCA
|
|
|
f494256 |
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib)
|
|
|
f494256 |
|
|
|
f494256 |
# --------------------------------------------------
|
|
|
f494256 |
+# By default static library
|
|
|
f494256 |
+function (invertBoolean varName varValue)
|
|
|
f494256 |
+ if (${varValue})
|
|
|
f494256 |
+ set(${varName} false PARENT_SCOPE)
|
|
|
f494256 |
+ else ()
|
|
|
f494256 |
+ set(${varName} true PARENT_SCOPE)
|
|
|
f494256 |
+ endif ()
|
|
|
f494256 |
+endfunction ()
|
|
|
f494256 |
+option(BUILD_SHARED_LIBS "Build shared libraries" OFF )
|
|
|
f494256 |
+invertBoolean("BUILD_STATIC_LIBS" ${BUILD_SHARED_LIBS})
|
|
|
f494256 |
+if ((${BUILD_SHARED_LIBS} EQUAL ON) AND NOT CMAKE_POSITION_INDEPENDENT_CODE)
|
|
|
f494256 |
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
|
|
f494256 |
+endif ()
|
|
|
f494256 |
+
|
|
|
f494256 |
+# --------------------------------------------------
|
|
|
f494256 |
# Check for any necessary platform specific compiler flags
|
|
|
f494256 |
include( CheckBLACSCompilerFlags )
|
|
|
f494256 |
CheckBLACSCompilerFlags()
|
|
|
f494256 |
@@ -183,11 +198,6 @@ message(STATUS "LAPACK library: ${LAPACK
|
|
|
f494256 |
MESSAGE(STATUS "=========")
|
|
|
f494256 |
|
|
|
f494256 |
# --------------------------------------------------
|
|
|
f494256 |
-# By default static library
|
|
|
f494256 |
-OPTION(BUILD_SHARED_LIBS "Build shared libraries" OFF )
|
|
|
f494256 |
-OPTION(BUILD_STATIC_LIBS "Build static libraries" ON )
|
|
|
f494256 |
-
|
|
|
f494256 |
-# --------------------------------------------------
|
|
|
f494256 |
# Subdirectories that need to be processed
|
|
|
f494256 |
|
|
|
f494256 |
macro(append_subdir_files variable dirname)
|