Skip to content

Commit

Permalink
[#9] changes made to make munge into an external
Browse files Browse the repository at this point in the history
  • Loading branch information
jassigill2000 authored and trel committed Oct 17, 2019
1 parent 2d7a4f6 commit 94c1c86
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_PACKAGE_DEPENDENCIES_LIST(ZMQ zeromq4-14.1.

string(REPLACE ";" ", " MUNGEFS_PACKAGE_DEPENDENCIES_STRING "${MUNGEFS_PACKAGE_DEPENDENCIES_LIST}")

set(CMAKE_C_COMPILER ${IRODS_EXTERNALS_FULLPATH_CLANG}/bin/clang)
set(CMAKE_CXX_COMPILER ${IRODS_EXTERNALS_FULLPATH_CLANG}/bin/clang++)

set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set(CMAKE_INSTALL_RPATH ${IRODS_EXTERNALS_FULLPATH_CLANG_RUNTIME}/lib)

project(mungefs C CXX)

set(MUNGEFS_PLATFORM_STRING linux_platform)
Expand Down Expand Up @@ -137,11 +131,7 @@ if (NOT CPACK_PACKAGING_INSTALL_PREFIX)
message(STATUS "Setting unspecified CPACK_PACKAGING_INSTALL_PREFIX to '${CPACK_PACKAGING_INSTALL_PREFIX}'. This is the correct setting for normal builds.")
endif()

set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -stdlib=libc++")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++")
add_compile_options(-nostdinc++ -Wall -Werror)
link_libraries(c++abi)
include_directories(${IRODS_EXTERNALS_FULLPATH_CLANG}/include/c++/v1)

set(THREADS_PREFER_PTHREAD_FLAG ON)
Expand Down

0 comments on commit 94c1c86

Please sign in to comment.