| Server IP : 82.208.35.60 / Your IP : 216.73.216.168 Web Server : Apache/2.4.55 (FreeBSD) OpenSSL/1.1.1q-freebsd PHP/7.3.31 System : FreeBSD server7.d2m.cz 12.4-RELEASE-p9 FreeBSD 12.4-RELEASE-p9 GENERIC amd64 User : studiokobylisy_cz ( 1008) PHP Version : 7.3.31 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : OFF | Perl : OFF | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : /usr/ports/sysutils/bareos-server/files/ |
Upload File : |
--- core/cmake/BareosFindAllLibraries.cmake 2021-12-21 06:00:49.000000000 -0500
+++ core/cmake/BareosFindAllLibraries.cmake 2021-12-22 00:16:58.093078000 -0500
@@ -42,56 +42,39 @@
set(Python3_FOUND 0)
else()
- find_package(Python2 COMPONENTS Interpreter Development)
- find_package(Python3 COMPONENTS Interpreter Development)
+ if(python)
+ find_package(Python3 COMPONENTS Interpreter Development)
- set(Python3_VERSION_MAJOR
- ${Python3_VERSION_MAJOR}
- PARENT_SCOPE
- )
-
- set(Python3_VERSION_MINOR
- ${Python3_VERSION_MINOR}
- PARENT_SCOPE
- )
-
- if(${Python2_FOUND} OR ${Python3_FOUND})
- set(HAVE_PYTHON 1)
- endif()
-
- if(${Python2_FOUND})
- set(PYTHON_EXECUTABLE
- ${Python2_EXECUTABLE}
+ set(Python3_VERSION_MAJOR
+ ${Python3_VERSION_MAJOR}
PARENT_SCOPE
)
- set(Python2_EXECUTABLE
- ${Python2_EXECUTABLE}
- PARENT_SCOPE
- )
- execute_process(
- COMMAND ${Python2_EXECUTABLE}
- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
- OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake
- )
- include(${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake)
- set(Python2_CCSHARED ${Python2_CC_FLAGS} -Wno-register)
- endif()
- if(${Python3_FOUND})
- set(PYTHON_EXECUTABLE
- ${Python3_EXECUTABLE}
+ set(Python3_VERSION_MINOR
+ ${Python3_VERSION_MINOR}
PARENT_SCOPE
)
- set(Python3_EXECUTABLE
- ${Python3_EXECUTABLE}
- PARENT_SCOPE
- )
- execute_process(
- COMMAND ${Python3_EXECUTABLE}
- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
- OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake
- )
- include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake)
+
+ if(${Python3_FOUND})
+ set(HAVE_PYTHON 1)
+ endif()
+
+ if(${Python3_FOUND})
+ set(PYTHON_EXECUTABLE
+ ${Python3_EXECUTABLE}
+ PARENT_SCOPE
+ )
+ set(Python3_EXECUTABLE
+ ${Python3_EXECUTABLE}
+ PARENT_SCOPE
+ )
+ execute_process(
+ COMMAND ${Python3_EXECUTABLE}
+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
+ OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake
+ )
+ include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake)
+ endif()
endif()
endif()
@@ -169,12 +152,18 @@
)
endif()
-bareosfindlibraryandheaders("rados" "rados/librados.h" "")
-bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h" "")
-bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h" "")
+if(rados)
+ bareosfindlibraryandheaders("rados" "rados/librados.h" "")
+ bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h" "")
+endif()
+if(cephfs)
+ bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h" "")
+endif()
bareosfindlibraryandheaders("pthread" "pthread.h" "")
bareosfindlibraryandheaders("cap" "sys/capability.h" "")
-bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h" "")
+if(gfapi)
+ bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h" "")
+endif()
bareosfindlibraryandheaders("pam" "security/pam_appl.h" "")