Skip to content

Commit

Permalink
python plugins: do not build for solaris
Browse files Browse the repository at this point in the history
The current way to detect the python build parameter leads to

  CC: error: unrecognized command line option '-KPIC'; did you mean '-fPIC'?

  Probably that would be solved when using the sunpro compiler, but that
  caused other problems.
  • Loading branch information
pstorz committed Oct 7, 2020
1 parent b3ff46f commit d327ee8
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions core/cmake/BareosFindAllLibraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,12 @@ else()
set(Python2_LIBRARIES ${PYTHON_LIBRARIES})
set(Python2_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
set(Python2_EXECUTABLE ${PYTHON_EXECUTABLE})
set(Python2_SITLIB ${PYTHON_SITLIB})

elseif(PYTHON_VERSION_MAJOR EQUAL 3)
set(Python3_FOUND ${PYTHONLIBS_FOUND})
set(Python3_LIBRARIES ${PYTHON_LIBRARIES})
set(Python3_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
set(Python3_SITLIB ${PYTHON_SITLIB})
endif()

set(Python_ADDITIONAL_VERSIONS 3.6 3.7 3.8 3.9)
Expand All @@ -70,13 +68,11 @@ else()
set(Python2_LIBRARIES ${PYTHON_LIBRARIES})
set(Python2_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
set(Python2_EXECUTABLE ${PYTHON_EXECUTABLE})
set(Python2_SITLIB ${PYTHON_SITLIB})
elseif (PYTHON_VERSION_MAJOR EQUAL 3)
elseif(PYTHON_VERSION_MAJOR EQUAL 3)
set(Python3_FOUND ${PYTHONLIBS_FOUND})
set(Python3_LIBRARIES ${PYTHON_LIBRARIES})
set(Python3_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
set(Python3_SITLIB ${PYTHON_SITLIB})
endif()

else()
Expand Down Expand Up @@ -121,14 +117,6 @@ else()
)
include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake)
endif()

else() # windows
set(HAVE_PYTHON 1)
set(Python2_FOUND 1)
set(Python2_EXT_SUFFIX ".dll")

set(Python3_FOUND 1)
set(Python3_EXT_SUFFIX ".pyd")
endif()

if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
Expand Down

0 comments on commit d327ee8

Please sign in to comment.