73 lines
2.4 KiB
Diff
73 lines
2.4 KiB
Diff
|
--- nfs-ganesha-2.2-rc6/src/CMakeLists.txt.orig 2015-04-01 15:33:18.887000000 -0400
|
||
|
|
+++ nfs-ganesha-2.2-rc6/src/CMakeLists.txt 2015-04-02 12:16:44.245000000 -0400
|
||
|
|
@@ -716,12 +716,15 @@
|
||
|
|
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/portability_cmake_2.8 /usr/share/cmake/Modules ${CMAKE_MODULE_PATH})
|
||
|
|
endif( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8" )
|
||
|
|
|
||
|
|
+find_library(LIBNTIRPC ntirpc) # extended Pthreads functions
|
||
|
|
+set(LIBTIRPC_INCLUDE_DIR "/usr/include/ntirpc")
|
||
|
|
+
|
||
|
|
include_directories(
|
||
|
|
"${PROJECT_BINARY_DIR}/include"
|
||
|
|
- "${PROJECT_SOURCE_DIR}/libntirpc/ntirpc/"
|
||
|
|
"${PROJECT_SOURCE_DIR}/include"
|
||
|
|
"${OS_INCLUDE_DIR}"
|
||
|
|
"${KRB5_INCLUDE_DIRS}"
|
||
|
|
+ "${LIBTIRPC_INCLUDE_DIR}"
|
||
|
|
)
|
||
|
|
|
||
|
|
# Fixup loose bits of autotools legacy
|
||
|
|
@@ -732,14 +735,13 @@
|
||
|
|
set(_USE_CB_SIMULATOR ON)
|
||
|
|
endif(USE_CB_SIMULATOR)
|
||
|
|
|
||
|
|
-
|
||
|
|
#callers add:
|
||
|
|
# target_link_libraries(your_library ${LIBTIRPC_LIBRARIES})
|
||
|
|
-set(LIBTIRPC_INCLUDE_DIR
|
||
|
|
- "${PROJECT_BINARY_DIR}/libtirpc/ntirpc"
|
||
|
|
- "${PROJECT_BINARY_DIR}/libtirpc/ntirpc/rpc"
|
||
|
|
-)
|
||
|
|
-set(LIBTIRPC_LIBRARIES "${PROJECT_BINARY_DIR}/libntirpc/src/libntirpc.a")
|
||
|
|
+#set(LIBTIRPC_INCLUDE_DIR
|
||
|
|
+# "${PROJECT_BINARY_DIR}/libtirpc/ntirpc"
|
||
|
|
+# "${PROJECT_BINARY_DIR}/libtirpc/ntirpc/rpc"
|
||
|
|
+#)
|
||
|
|
+#set(LIBTIRPC_LIBRARIES "${PROJECT_BINARY_DIR}/libntirpc/src/libntirpc.a")
|
||
|
|
|
||
|
|
# Find misc system libs
|
||
|
|
find_library(LIBRT rt) # extended Pthreads functions
|
||
|
|
@@ -867,6 +869,7 @@
|
||
|
|
${KRB5_LIBRARIES}
|
||
|
|
${CMAKE_THREAD_LIBS_INIT}
|
||
|
|
${LIBRT}
|
||
|
|
+ ${LIBNTIRPC}
|
||
|
|
)
|
||
|
|
|
||
|
|
# Config file; make sure it doesn't clobber an existing one
|
||
|
|
@@ -877,16 +880,6 @@
|
||
|
|
# pre-create PREFIX/var/run/ganesha
|
||
|
|
install(DIRECTORY DESTINATION ${SYSSTATEDIR}/run/ganesha)
|
||
|
|
|
||
|
|
-IF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/CMakeLists.txt )
|
||
|
|
-message( FATAL_ERROR
|
||
|
|
-"No CMakeLists.txt found in libntirpc
|
||
|
|
-This probably means that the directory was not properly populated.
|
||
|
|
-Please run the following command to do that and use cmake again:
|
||
|
|
- git submodule update --init
|
||
|
|
-Alternatively, if you are not using git, get the current version at
|
||
|
|
- https://github.com/nfs-ganesha/ntirpc" )
|
||
|
|
-ENDIF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/CMakeLists.txt )
|
||
|
|
-
|
||
|
|
add_subdirectory(log)
|
||
|
|
add_subdirectory(config_parsing)
|
||
|
|
add_subdirectory(cidr)
|
||
|
|
@@ -896,7 +889,6 @@
|
||
|
|
add_subdirectory(NodeList)
|
||
|
|
add_subdirectory(cache_inode)
|
||
|
|
add_subdirectory(SAL)
|
||
|
|
-add_subdirectory(libntirpc)
|
||
|
|
add_subdirectory(RPCAL)
|
||
|
|
add_subdirectory(Protocols)
|
||
|
|
add_subdirectory(support)
|