diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index e7eac31e45..c5a7b605b3 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -108,6 +108,7 @@ MACRO(PYTHON_ADD_MODULE _NAME ) ENDIF(PYTHON_MODULE_${_NAME}_BUILD_SHARED) SET(PY_MODULES_LIST ${PY_MODULES_LIST} ${_NAME} CACHE STRING "Collect a list of all added python modules" FORCE) + message(STATUS "modules: ${PY_MODULES_LIST}") ADD_LIBRARY(${_NAME} ${PY_MODULE_TYPE} ${ARGN}) # TARGET_LINK_LIBRARIES(${_NAME} ${PYTHON_LIBRARIES}) ENDIF(PYTHON_ENABLE_MODULE_${_NAME}) diff --git a/Modules/Platform/BlueGeneL.cmake b/Modules/Platform/BlueGeneL.cmake index b104ad9b3b..1eb5072fb5 100644 --- a/Modules/Platform/BlueGeneL.cmake +++ b/Modules/Platform/BlueGeneL.cmake @@ -23,15 +23,10 @@ INCLUDE(Platform/UnixPaths) IF(CMAKE_COMPILER_IS_GNUCC) SET(CMAKE_C_LINK_EXECUTABLE - " -o -Wl,-lgcc,-lc -lnss_files -lnss_dns -lresolv") + " -Wl,-relax -o -Wl,-lgcc,-lc -lnss_files -lnss_dns -lresolv") ENDIF(CMAKE_COMPILER_IS_GNUCC) IF(CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_CXX_LINK_EXECUTABLE - " -o -Wl,-lstdc++,-lgcc,-lc -lnss_files -lnss_dns -lresolv") + " -Wl,-relax -o -Wl,-lstdc++,-lgcc,-lc -lnss_files -lnss_dns -lresolv") ENDIF(CMAKE_COMPILER_IS_GNUCXX) - -SET(CMAKE_CXX_LINK_SHARED_LIBRARY) -SET(CMAKE_CXX_LINK_MODULE_LIBRARY) -SET(CMAKE_C_LINK_SHARED_LIBRARY) -SET(CMAKE_C_LINK_MODULE_LIBRARY)