Skip to content
Snippets Groups Projects
Commit 5ee59e69 authored by Felix A. Croes's avatar Felix A. Croes
Browse files

Required changes for iRODS 4.2.10.

parent be96c8e2
Branches
No related tags found
No related merge requests found
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules")
find_package(IRODS 4.2.8 EXACT REQUIRED) find_package(IRODS 4.2.10 EXACT REQUIRED)
message(STATUS "Building for irods-server version ${IRODS_VERSION}") message(STATUS "Building for irods-server version ${IRODS_VERSION}")
...@@ -18,7 +18,7 @@ set(CMAKE_CXX_COMPILER ${IRODS_EXTERNALS_FULLPATH_CLANG}/bin/clang++) ...@@ -18,7 +18,7 @@ set(CMAKE_CXX_COMPILER ${IRODS_EXTERNALS_FULLPATH_CLANG}/bin/clang++)
project(wur-msis CXX) project(wur-msis CXX)
add_compile_options(-std=c++14 add_compile_options(-std=c++17
-Os -Os
-fPIC -fPIC
-DRODS_SERVER -DRODS_SERVER
...@@ -36,6 +36,7 @@ add_compile_options(-std=c++14 ...@@ -36,6 +36,7 @@ add_compile_options(-std=c++14
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++")
link_libraries(c++abi) link_libraries(c++abi)
include_directories("${IRODS_EXTERNALS_FULLPATH_CLANG}/include/c++/v1") include_directories("${IRODS_EXTERNALS_FULLPATH_CLANG}/include/c++/v1")
include_directories(${IRODS_EXTERNALS_FULLPATH_JSON}/include)
include_directories("/usr/include/irods") include_directories("/usr/include/irods")
find_package(Boost REQUIRED) find_package(Boost REQUIRED)
...@@ -84,7 +85,7 @@ set(CPACK_MONOLITHIC_INSTALL 1) ...@@ -84,7 +85,7 @@ set(CPACK_MONOLITHIC_INSTALL 1)
set(CPACK_CMAKE_GENERATOR "Unix Makefiles") set(CPACK_CMAKE_GENERATOR "Unix Makefiles")
# Run custom CMake module to detect OS family # Run custom CMake module to detect OS family
include(${CMAKE_MODULE_PATH}/DetectOS.cmake) include(${CMAKE_CURRENT_LIST_DIR}/CMakeModules/DetectOS.cmake)
message(STATUS "Found Linux distro ${DETECTED_OS}") message(STATUS "Found Linux distro ${DETECTED_OS}")
# Determine which type of package should be generated # Determine which type of package should be generated
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment