diff options
author | Andrej Shadura <andrewsh@debian.org> | 2020-06-09 22:08:20 +0200 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2020-06-09 22:08:20 +0200 |
commit | 8dd1422b26ad22371af1c04388a50cffdffc0e4b (patch) | |
tree | fb0dc2bd9c385a0ca528ce6c172f72ff0a2a2d66 /cmake | |
parent | 3259ab99df8d8746a46ca7469635751f604e42fc (diff) |
New upstream version 3.10.5
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/README.txt | 2 | ||||
-rw-r--r-- | cmake/modules/FindLDAP.cmake | 24 | ||||
-rw-r--r-- | cmake/modules/FindLdap.cmake | 35 | ||||
-rw-r--r-- | cmake/modules/FindXercesC.cmake | 28 | ||||
-rw-r--r-- | cmake/modules/VersionInfo.cmake | 37 |
5 files changed, 30 insertions, 96 deletions
diff --git a/cmake/README.txt b/cmake/README.txt index 6c6e4ab..afc01f8 100644 --- a/cmake/README.txt +++ b/cmake/README.txt @@ -1 +1 @@ -Inner component, do not use. Contact for assistance by email abi@id.ee or http://www.id.ee +Inner component, do not use. Contact our support via www.id.ee for assistance. diff --git a/cmake/modules/FindLDAP.cmake b/cmake/modules/FindLDAP.cmake new file mode 100644 index 0000000..4b9d571 --- /dev/null +++ b/cmake/modules/FindLDAP.cmake @@ -0,0 +1,24 @@ +# - Try to find the LDAP client libraries +# Once done this will define +# +# LDAP_FOUND - system has libldap +# LDAP_INCLUDE_DIR - the ldap include directory +# LDAP_LIBRARIES - libldap + liblber library + +set(CMAKE_FIND_FRAMEWORK LAST) +find_path(LDAP_INCLUDE_DIR ldap.h Winldap.h) +find_library(LDAP_LIBRARY NAMES ldap Wldap32) +find_library(LBER_LIBRARY NAMES lber) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LDAP DEFAULT_MSG LDAP_LIBRARY) + +if(LDAP_FOUND) + if(LBER_LIBRARY) + set(LDAP_LIBRARIES ${LDAP_LIBRARY} ${LBER_LIBRARY}) + else() + set(LDAP_LIBRARIES ${LDAP_LIBRARY}) + endif() +endif() + +mark_as_advanced(LDAP_INCLUDE_DIR LDAP_LIBRARY LBER_LIBRARY) diff --git a/cmake/modules/FindLdap.cmake b/cmake/modules/FindLdap.cmake deleted file mode 100644 index 188debd..0000000 --- a/cmake/modules/FindLdap.cmake +++ /dev/null @@ -1,35 +0,0 @@ -# - Try to find the LDAP client libraries -# Once done this will define -# -# LDAP_FOUND - system has libldap -# LDAP_INCLUDE_DIR - the ldap include directory -# LDAP_LIBRARIES - libldap + liblber (if found) library -# LBER_LIBRARIES - liblber library - -if(LDAP_INCLUDE_DIR AND LDAP_LIBRARIES) - # Already in cache, be silent - set(Ldap_FIND_QUIETLY TRUE) -endif() - -FIND_PATH(LDAP_INCLUDE_DIR ldap.h) -FIND_LIBRARY(LDAP_LIBRARIES NAMES ldap) -FIND_LIBRARY(LBER_LIBRARIES NAMES lber) - -if(LDAP_INCLUDE_DIR AND LDAP_LIBRARIES) - set(LDAP_FOUND TRUE) - if(LBER_LIBRARIES) - set(LDAP_LIBRARIES ${LDAP_LIBRARIES} ${LBER_LIBRARIES}) - endif() -endif() - -if(LDAP_FOUND) - if(NOT Ldap_FIND_QUIETLY) - message(STATUS "Found ldap: ${LDAP_LIBRARIES}") - endif() -else() - if(Ldap_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find ldap") - endif() -endif() - -MARK_AS_ADVANCED(LDAP_INCLUDE_DIR LDAP_LIBRARIES LBER_LIBRARIES) diff --git a/cmake/modules/FindXercesC.cmake b/cmake/modules/FindXercesC.cmake deleted file mode 100644 index 6f31742..0000000 --- a/cmake/modules/FindXercesC.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# - Find Xerces-C -# Find the Xerces-C includes and library -# -# XERCESC_INCLUDE_DIR - Where to find xercesc include sub-directory. -# XERCESC_LIBRARIES - List of libraries when using Xerces-C. -# XERCESC_FOUND - True if Xerces-C found. - - -IF (XERCESC_INCLUDE_DIR) - # Already in cache, be silent. - SET(XERCESC_FIND_QUIETLY TRUE) -ENDIF (XERCESC_INCLUDE_DIR) - -FIND_PATH(XERCESC_INCLUDE_DIR xercesc/dom/DOM.hpp) -FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c xerces-c_3) - -# Handle the QUIETLY and REQUIRED arguments and set XERCESC_FOUND to -# TRUE if all listed variables are TRUE. -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XercesC DEFAULT_MSG XERCESC_LIBRARY XERCESC_INCLUDE_DIR) - -IF(XERCESC_FOUND) - SET( XERCESC_LIBRARIES ${XERCESC_LIBRARY} ) -ELSE(XERCESC_FOUND) - SET( XERCESC_LIBRARIES ) -ENDIF(XERCESC_FOUND) - -MARK_AS_ADVANCED( XERCESC_LIBRARY XERCESC_INCLUDE_DIR ) diff --git a/cmake/modules/VersionInfo.cmake b/cmake/modules/VersionInfo.cmake index 53024c3..864a52e 100644 --- a/cmake/modules/VersionInfo.cmake +++ b/cmake/modules/VersionInfo.cmake @@ -19,6 +19,11 @@ add_definitions( -DBUILD_DATE=\"${BUILD_DATE}\" ) +set(CMAKE_C_VISIBILITY_PRESET hidden) +set(CMAKE_CXX_VISIBILITY_PRESET hidden) +set(CMAKE_VISIBILITY_INLINES_HIDDEN YES) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED YES) set( MACOSX_BUNDLE_COPYRIGHT "(C) 2010-2018 Estonian Information System Authority" ) set( MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION} ) set( MACOSX_BUNDLE_BUNDLE_VERSION ${BUILD_VER} ) @@ -65,35 +70,3 @@ macro( SET_ENV NAME DEF ) set( ${NAME} ${DEF} ${ARGN} ) endif() endmacro() - - -if(NOT DEFINED ENABLE_VISIBILITY) - if(POLICY CMP0063) - cmake_policy(GET CMP0063 VISIBILITY_POLICY) - endif() - if(VISIBILITY_POLICY STREQUAL NEW) - set(CMAKE_C_VISIBILITY_PRESET hidden) - set(CMAKE_CXX_VISIBILITY_PRESET hidden) - set(CMAKE_VISIBILITY_INLINES_HIDDEN YES) - elseif(CMAKE_COMPILER_IS_GNUCC OR __COMPILER_GNU) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") - endif() -endif() - -if(NOT DISABLE_CXX11) - if(CMAKE_VERSION VERSION_GREATER 3.1.0) - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED YES) - elseif(CMAKE_COMPILER_IS_GNUCC OR __COMPILER_GNU) - include(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG(-std=c++11 C11) - CHECK_CXX_COMPILER_FLAG(-std=c++0x C0X) - if(C11) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - elseif(C0X) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") - endif() - set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++0x") - endif() -endif() |