From e4a58682c79ba8b46b25b0b4565307a3ae8b8670 Mon Sep 17 00:00:00 2001
From: Thomas Purcell <purcell@fhi-berlin.mpg.de>
Date: Thu, 23 Jul 2020 13:23:40 +0200
Subject: [PATCH] cmake warning fix removed
---
CMakeLists.txt | 15 ---------------
src/CMakeLists.txt | 2 +-
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8daf6ff..2508335b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,29 +137,14 @@ else(EXTERNAL_BOOST)
set(Boost_INCLUDE_DIRS ${Boost_INSTALL_DIR}/include)
set(Boost_LIBRARY_DIRS ${Boost_INSTALL_DIR}/lib)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "Absoft" ABSOFT_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "ADSP" ADSP_COMP)
string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "AppleClang" AP_CLANG_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "ARMCC" ARM_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "ARMClang" ARM_CLANG_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "Bruce" BRUCE_COMP)
string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "Clang" CLANG_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "Cray" CRAY_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "Embarcadero" BORLAND_COMP)
string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "Borland" BORLAND_COMP)
string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "GNU" GNU_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "GHS" GHS_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "HP" HP_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "IAR" IAR_COMP)
string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "MSVC" MSVC_COMP)
string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "Intel" INTEL_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "OpenWatcom" OWC_COMP)
string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "PGI" PGI_COMP)
string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "PathScale" PS_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "SDCC" SDCC_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "SunPro" SUN_PRO_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "TI" TI_COMP)
- string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "TinyCC" TINY_CC_COMP)
string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "XL" IBM_COMP)
string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "VisualAge" IBM_COMP)
string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "zOS" IMP_COMP)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b60e7b0e..31815159 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -61,7 +61,7 @@ if(USE_PYTHON)
SUFFIX ".so"
)
# target_link_libraries(_sisso ${MPI_LIBRARIES} -Wl,--rpath=${PYTHON_PREFIX}/lib/ ${PYTHON_LAPACK_LIBRARIES} ${PYTHON_LIBRARIES} -Wl,--rpath=${Boost_LIB_DIR} ${Boost_LIBS})
- target_link_libraries(_sisso ${MPI_LIBRARIES} -Wl,--rpath=${PYTHON_PREFIX}/lib/ ${PYTHON_LAPACK_LIBRARIES} ${PYTHON_LIBRARIES} -Wl,--rpath=${Boost_LIB_DIR} ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES})
+ target_link_libraries(_sisso ${MPI_LIBRARIES} -Wl,--rpath=${PYTHON_PREFIX}/lib/ ${LAPACK_LIBRARIES} ${PYTHON_LIBRARIES} -Wl,--rpath=${Boost_LIB_DIR} ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES})
install(TARGETS _sisso DESTINATION "${PYTHON_INSTDIR}/sisso")
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/python/ DESTINATION ${PYTHON_INSTDIR}/sisso
FILES_MATCHING PATTERN "*.py"
--
GitLab