"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "CMakeLists.txt" between
irods-4.2.5.tar.gz and irods-4.2.6.tar.gz

About: iRODS (the integrated Rule Oriented Data System) is a distributed data-management system for creating data grids, digital libraries, persistent archives, and real-time data systems.

CMakeLists.txt  (irods-4.2.5):CMakeLists.txt  (irods-4.2.6)
skipping to change at line 78 skipping to change at line 78
find_library(PAM_LIBRARY pam) find_library(PAM_LIBRARY pam)
if (PAM_LIBRARY) if (PAM_LIBRARY)
message(STATUS "Found pam: ${PAM_LIBRARY}") message(STATUS "Found pam: ${PAM_LIBRARY}")
else() else()
message(FATAL_ERROR "pam library not found") message(FATAL_ERROR "pam library not found")
endif() endif()
endif() endif()
set(IRODS_VERSION_MAJOR "4") set(IRODS_VERSION_MAJOR "4")
set(IRODS_VERSION_MINOR "2") set(IRODS_VERSION_MINOR "2")
set(IRODS_VERSION_PATCH "5") set(IRODS_VERSION_PATCH "6")
set(IRODS_VERSION "${IRODS_VERSION_MAJOR}.${IRODS_VERSION_MINOR}.${IRODS_VERSION _PATCH}") set(IRODS_VERSION "${IRODS_VERSION_MAJOR}.${IRODS_VERSION_MINOR}.${IRODS_VERSION _PATCH}")
set(IRODS_CXX_STANDARD 14) set(IRODS_CXX_STANDARD 14)
set(IRODS_PLATFORM_STRING linux_platform) set(IRODS_PLATFORM_STRING linux_platform)
set(IRODS_COMPILE_DEFINITIONS ${IRODS_PLATFORM_STRING} _LARGEFILE_SOURCE _FILE_O FFSET_BITS=64 _LARGE_FILES _LARGEFILE64_SOURCE BOOST_SYSTEM_NO_DEPRECATED) set(IRODS_COMPILE_DEFINITIONS ${IRODS_PLATFORM_STRING} _LARGEFILE_SOURCE _FILE_O FFSET_BITS=64 _LARGE_FILES _LARGEFILE64_SOURCE BOOST_SYSTEM_NO_DEPRECATED)
if (NOT IRODS_LINUX_DISTRIBUTION_NAME) if (NOT IRODS_LINUX_DISTRIBUTION_NAME)
execute_process( execute_process(
COMMAND "python" "-c" "from __future__ import print_function; import platfor m; print(platform.linux_distribution()[0].split()[0].strip().lower(), end='')" COMMAND "python" "-c" "from __future__ import print_function; import platfor m; print(platform.linux_distribution()[0].split()[0].strip().lower(), end='')"
skipping to change at line 227 skipping to change at line 227
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(GetGitRevisionDescription) include(GetGitRevisionDescription)
get_git_head_revision(IRODS_GIT_REFSPEC IRODS_GIT_SHA1) get_git_head_revision(IRODS_GIT_REFSPEC IRODS_GIT_SHA1)
configure_file( configure_file(
${CMAKE_SOURCE_DIR}/VERSION.json.dist.in ${CMAKE_SOURCE_DIR}/VERSION.json.dist.in
${CMAKE_BINARY_DIR}/VERSION.json.dist ${CMAKE_BINARY_DIR}/VERSION.json.dist
@ONLY @ONLY
) )
add_library(
irods_filesystem_path
OBJECT
${CMAKE_SOURCE_DIR}/lib/filesystem/src/path.cpp
)
target_include_directories(
irods_filesystem_path
PRIVATE
${CMAKE_SOURCE_DIR}/lib/filesystem/include
${CMAKE_SOURCE_DIR}/lib/core/include
${IRODS_EXTERNALS_FULLPATH_BOOST}/include
)
set_target_properties(irods_filesystem_path PROPERTIES CXX_STANDARD ${IRODS_CXX_
STANDARD})
target_compile_options(irods_filesystem_path PRIVATE -fPIC -Wno-write-strings)
target_compile_definitions(irods_filesystem_path PRIVATE ${IRODS_COMPILE_DEFINIT
IONS})
add_library(
irods_filesystem_client
OBJECT
${CMAKE_SOURCE_DIR}/lib/filesystem/src/filesystem.cpp
${CMAKE_SOURCE_DIR}/lib/filesystem/src/collection_iterator.cpp
${CMAKE_SOURCE_DIR}/lib/filesystem/src/recursive_collection_iterator.cpp
)
target_include_directories(
irods_filesystem_client
PRIVATE
${CMAKE_BINARY_DIR}/lib/core/include
${CMAKE_SOURCE_DIR}/lib/core/include
${CMAKE_SOURCE_DIR}/lib/api/include
${CMAKE_SOURCE_DIR}/lib/hasher/include
${CMAKE_SOURCE_DIR}/lib/rbudp/include
${CMAKE_SOURCE_DIR}/lib/filesystem/include
${CMAKE_SOURCE_DIR}/server/core/include
${CMAKE_SOURCE_DIR}/server/icat/include
${CMAKE_SOURCE_DIR}/server/re/include
${CMAKE_SOURCE_DIR}/server/drivers/include
${IRODS_EXTERNALS_FULLPATH_BOOST}/include
${IRODS_EXTERNALS_FULLPATH_JANSSON}/include
${OPENSSL_INCLUDE_DIR}
)
set_target_properties(irods_filesystem_client PROPERTIES CXX_STANDARD ${IRODS_CX
X_STANDARD})
target_compile_options(irods_filesystem_client PRIVATE -fPIC -Wno-write-strings)
target_compile_definitions(irods_filesystem_client PRIVATE ${IRODS_COMPILE_DEFIN
ITIONS})
add_library(
irods_filesystem_server
OBJECT
${CMAKE_SOURCE_DIR}/lib/filesystem/src/filesystem.cpp
${CMAKE_SOURCE_DIR}/lib/filesystem/src/collection_iterator.cpp
${CMAKE_SOURCE_DIR}/lib/filesystem/src/recursive_collection_iterator.cpp
)
target_include_directories(
irods_filesystem_server
PRIVATE
${CMAKE_BINARY_DIR}/lib/core/include
${CMAKE_SOURCE_DIR}/lib/core/include
${CMAKE_SOURCE_DIR}/lib/api/include
${CMAKE_SOURCE_DIR}/lib/hasher/include
${CMAKE_SOURCE_DIR}/lib/rbudp/include
${CMAKE_SOURCE_DIR}/lib/filesystem/include
${CMAKE_SOURCE_DIR}/server/core/include
${CMAKE_SOURCE_DIR}/server/api/include
${CMAKE_SOURCE_DIR}/server/icat/include
${CMAKE_SOURCE_DIR}/server/re/include
${CMAKE_SOURCE_DIR}/server/drivers/include
${IRODS_EXTERNALS_FULLPATH_BOOST}/include
${IRODS_EXTERNALS_FULLPATH_JANSSON}/include
${OPENSSL_INCLUDE_DIR}
)
set_target_properties(irods_filesystem_server PROPERTIES CXX_STANDARD ${IRODS_CX
X_STANDARD})
target_compile_options(irods_filesystem_server PRIVATE -fPIC -Wno-write-strings)
target_compile_definitions(irods_filesystem_server PRIVATE ${IRODS_COMPILE_DEFIN
ITIONS} IRODS_FILESYSTEM_ENABLE_SERVER_SIDE_API IRODS_IO_TRANSPORT_ENABLE_SERVER
_SIDE_API)
set( set(
IRODS_LIBIRODS_CLIENT_SOURCES IRODS_LIBIRODS_CLIENT_SOURCES
${CMAKE_SOURCE_DIR}/lib/api/src/rcAuthCheck.cpp ${CMAKE_SOURCE_DIR}/lib/api/src/rcAuthCheck.cpp
${CMAKE_SOURCE_DIR}/lib/api/src/rcAuthPluginRequest.cpp ${CMAKE_SOURCE_DIR}/lib/api/src/rcAuthPluginRequest.cpp
${CMAKE_SOURCE_DIR}/lib/api/src/rcAuthRequest.cpp ${CMAKE_SOURCE_DIR}/lib/api/src/rcAuthRequest.cpp
${CMAKE_SOURCE_DIR}/lib/api/src/rcAuthResponse.cpp ${CMAKE_SOURCE_DIR}/lib/api/src/rcAuthResponse.cpp
${CMAKE_SOURCE_DIR}/lib/api/src/rcBulkDataObjPut.cpp ${CMAKE_SOURCE_DIR}/lib/api/src/rcBulkDataObjPut.cpp
${CMAKE_SOURCE_DIR}/lib/api/src/rcBulkDataObjReg.cpp ${CMAKE_SOURCE_DIR}/lib/api/src/rcBulkDataObjReg.cpp
${CMAKE_SOURCE_DIR}/lib/api/src/rcChkNVPathPerm.cpp ${CMAKE_SOURCE_DIR}/lib/api/src/rcChkNVPathPerm.cpp
${CMAKE_SOURCE_DIR}/lib/api/src/rcChkObjPermAndStat.cpp ${CMAKE_SOURCE_DIR}/lib/api/src/rcChkObjPermAndStat.cpp
skipping to change at line 396 skipping to change at line 469
${CMAKE_SOURCE_DIR}/lib/core/src/regUtil.cpp ${CMAKE_SOURCE_DIR}/lib/core/src/regUtil.cpp
${CMAKE_SOURCE_DIR}/lib/core/src/replUtil.cpp ${CMAKE_SOURCE_DIR}/lib/core/src/replUtil.cpp
${CMAKE_SOURCE_DIR}/lib/core/src/rmdirUtil.cpp ${CMAKE_SOURCE_DIR}/lib/core/src/rmdirUtil.cpp
${CMAKE_SOURCE_DIR}/lib/core/src/rmUtil.cpp ${CMAKE_SOURCE_DIR}/lib/core/src/rmUtil.cpp
${CMAKE_SOURCE_DIR}/lib/core/src/rmtrashUtil.cpp ${CMAKE_SOURCE_DIR}/lib/core/src/rmtrashUtil.cpp
${CMAKE_SOURCE_DIR}/lib/core/src/rsyncUtil.cpp ${CMAKE_SOURCE_DIR}/lib/core/src/rsyncUtil.cpp
${CMAKE_SOURCE_DIR}/lib/core/src/scanUtil.cpp ${CMAKE_SOURCE_DIR}/lib/core/src/scanUtil.cpp
${CMAKE_SOURCE_DIR}/lib/core/src/sockComm.cpp ${CMAKE_SOURCE_DIR}/lib/core/src/sockComm.cpp
${CMAKE_SOURCE_DIR}/lib/core/src/sslSockComm.cpp ${CMAKE_SOURCE_DIR}/lib/core/src/sslSockComm.cpp
${CMAKE_SOURCE_DIR}/lib/core/src/trimUtil.cpp ${CMAKE_SOURCE_DIR}/lib/core/src/trimUtil.cpp
$<TARGET_OBJECTS:irods_filesystem_path>
$<TARGET_OBJECTS:irods_filesystem_client>
) )
add_library( add_library(
irods_client irods_client
SHARED SHARED
${IRODS_LIBIRODS_CLIENT_SOURCES} ${IRODS_LIBIRODS_CLIENT_SOURCES}
) )
target_link_libraries( target_link_libraries(
irods_client irods_client
PRIVATE PRIVATE
irods_plugin_dependencies irods_plugin_dependencies
skipping to change at line 426 skipping to change at line 501
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
) )
target_include_directories( target_include_directories(
irods_client irods_client
PRIVATE PRIVATE
${CMAKE_BINARY_DIR}/lib/core/include ${CMAKE_BINARY_DIR}/lib/core/include
${CMAKE_SOURCE_DIR}/lib/core/include ${CMAKE_SOURCE_DIR}/lib/core/include
${CMAKE_SOURCE_DIR}/lib/api/include ${CMAKE_SOURCE_DIR}/lib/api/include
${CMAKE_SOURCE_DIR}/lib/hasher/include ${CMAKE_SOURCE_DIR}/lib/hasher/include
${CMAKE_SOURCE_DIR}/lib/rbudp/include ${CMAKE_SOURCE_DIR}/lib/rbudp/include
${CMAKE_SOURCE_DIR}/lib/filesystem/include
${CMAKE_SOURCE_DIR}/server/core/include ${CMAKE_SOURCE_DIR}/server/core/include
${CMAKE_SOURCE_DIR}/server/icat/include ${CMAKE_SOURCE_DIR}/server/icat/include
${CMAKE_SOURCE_DIR}/server/re/include ${CMAKE_SOURCE_DIR}/server/re/include
${CMAKE_SOURCE_DIR}/server/drivers/include ${CMAKE_SOURCE_DIR}/server/drivers/include
${IRODS_EXTERNALS_FULLPATH_BOOST}/include ${IRODS_EXTERNALS_FULLPATH_BOOST}/include
${IRODS_EXTERNALS_FULLPATH_JANSSON}/include ${IRODS_EXTERNALS_FULLPATH_JANSSON}/include
${OPENSSL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR}
) )
set_property(TARGET irods_client PROPERTY CXX_STANDARD ${IRODS_CXX_STANDARD}) set_property(TARGET irods_client PROPERTY CXX_STANDARD ${IRODS_CXX_STANDARD})
set_property(TARGET irods_client PROPERTY VERSION ${IRODS_VERSION}) set_property(TARGET irods_client PROPERTY VERSION ${IRODS_VERSION})
skipping to change at line 644 skipping to change at line 720
${CMAKE_SOURCE_DIR}/server/re/src/irods_re_ruleexistshelper.cpp ${CMAKE_SOURCE_DIR}/server/re/src/irods_re_ruleexistshelper.cpp
${CMAKE_SOURCE_DIR}/server/re/src/irods_re_serialization.cpp ${CMAKE_SOURCE_DIR}/server/re/src/irods_re_serialization.cpp
${CMAKE_SOURCE_DIR}/server/re/src/keyValPairMS.cpp ${CMAKE_SOURCE_DIR}/server/re/src/keyValPairMS.cpp
${CMAKE_SOURCE_DIR}/server/re/src/locks.cpp ${CMAKE_SOURCE_DIR}/server/re/src/locks.cpp
${CMAKE_SOURCE_DIR}/server/re/src/mailMS.cpp ${CMAKE_SOURCE_DIR}/server/re/src/mailMS.cpp
${CMAKE_SOURCE_DIR}/server/re/src/miscMS.cpp ${CMAKE_SOURCE_DIR}/server/re/src/miscMS.cpp
${CMAKE_SOURCE_DIR}/server/re/src/printMS.cpp ${CMAKE_SOURCE_DIR}/server/re/src/printMS.cpp
${CMAKE_SOURCE_DIR}/server/re/src/reDataObjOpr.cpp ${CMAKE_SOURCE_DIR}/server/re/src/reDataObjOpr.cpp
${CMAKE_SOURCE_DIR}/server/re/src/reIn2p3SysRule.cpp ${CMAKE_SOURCE_DIR}/server/re/src/reIn2p3SysRule.cpp
${CMAKE_SOURCE_DIR}/server/re/src/reNaraMetaData.cpp ${CMAKE_SOURCE_DIR}/server/re/src/reNaraMetaData.cpp
${CMAKE_SOURCE_DIR}/server/re/src/reStruct.cpp
${CMAKE_SOURCE_DIR}/server/re/src/reSysDataObjOpr.cpp ${CMAKE_SOURCE_DIR}/server/re/src/reSysDataObjOpr.cpp
${CMAKE_SOURCE_DIR}/server/re/src/sharedmemory.cpp ${CMAKE_SOURCE_DIR}/server/re/src/sharedmemory.cpp
${CMAKE_SOURCE_DIR}/server/re/src/testMS.cpp ${CMAKE_SOURCE_DIR}/server/re/src/testMS.cpp
${CMAKE_SOURCE_DIR}/server/re/src/xmsgMS.cpp ${CMAKE_SOURCE_DIR}/server/re/src/xmsgMS.cpp
$<TARGET_OBJECTS:irods_filesystem_server>
) )
add_library( add_library(
irods_server irods_server
SHARED SHARED
${IRODS_LIBIRODS_SERVER_SOURCES} ${IRODS_LIBIRODS_SERVER_SOURCES}
${IRODS_LIBIRODS_CLIENT_SOURCES} ${IRODS_LIBIRODS_CLIENT_SOURCES}
) )
target_link_libraries( target_link_libraries(
irods_server irods_server
PRIVATE PRIVATE
skipping to change at line 682 skipping to change at line 760
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
) )
target_include_directories( target_include_directories(
irods_server irods_server
PRIVATE PRIVATE
${CMAKE_BINARY_DIR}/lib/core/include ${CMAKE_BINARY_DIR}/lib/core/include
${CMAKE_SOURCE_DIR}/lib/api/include ${CMAKE_SOURCE_DIR}/lib/api/include
${CMAKE_SOURCE_DIR}/lib/core/include ${CMAKE_SOURCE_DIR}/lib/core/include
${CMAKE_SOURCE_DIR}/lib/hasher/include ${CMAKE_SOURCE_DIR}/lib/hasher/include
${CMAKE_SOURCE_DIR}/lib/rbudp/include ${CMAKE_SOURCE_DIR}/lib/rbudp/include
${CMAKE_SOURCE_DIR}/lib/filesystem/include
${CMAKE_SOURCE_DIR}/server/api/include ${CMAKE_SOURCE_DIR}/server/api/include
${CMAKE_SOURCE_DIR}/server/core/include ${CMAKE_SOURCE_DIR}/server/core/include
${CMAKE_SOURCE_DIR}/server/drivers/include ${CMAKE_SOURCE_DIR}/server/drivers/include
${CMAKE_SOURCE_DIR}/server/icat/include ${CMAKE_SOURCE_DIR}/server/icat/include
${CMAKE_SOURCE_DIR}/server/re/include ${CMAKE_SOURCE_DIR}/server/re/include
${IRODS_EXTERNALS_FULLPATH_AVRO}/include ${IRODS_EXTERNALS_FULLPATH_AVRO}/include
${IRODS_EXTERNALS_FULLPATH_BOOST}/include ${IRODS_EXTERNALS_FULLPATH_BOOST}/include
${IRODS_EXTERNALS_FULLPATH_JANSSON}/include ${IRODS_EXTERNALS_FULLPATH_JANSSON}/include
${IRODS_EXTERNALS_FULLPATH_CPPZMQ}/include ${IRODS_EXTERNALS_FULLPATH_CPPZMQ}/include
${IRODS_EXTERNALS_FULLPATH_ZMQ}/include ${IRODS_EXTERNALS_FULLPATH_ZMQ}/include
 End of changes. 7 change blocks. 
1 lines changed or deleted 87 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)