From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Wed, 11 Nov 2020 07:34:17 +0000 (+0000)
Subject: cmake: skip osd, Lua and neorados on Windows
X-Git-Tag: v16.1.0~138^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f65e89d83e1c5be203ecf27cb0a716bb8d4d56c;p=ceph.git

cmake: skip osd, Lua and neorados on Windows

Those libraries are currently unsuported on Windows, so we're
going to update the cmake file to skip them.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index baa149fc543..df1a9d46b37 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -512,7 +512,9 @@ endif(${WITH_LTTNG})
 
 add_subdirectory(global)
 
-find_package(Lua 5.3 REQUIRED)
+if(NOT WIN32)
+  find_package(Lua 5.3 REQUIRED)
+endif()
 
 # rados object classes
 add_subdirectory(cls)
@@ -585,10 +587,9 @@ endif()
 
 add_subdirectory(kv)
 add_subdirectory(os)
+
 if(NOT WIN32)
 add_subdirectory(blk)
-endif()
-
 add_subdirectory(osd)
 
 set(ceph_osd_srcs
@@ -609,6 +610,8 @@ set_target_properties(ceph-osd PROPERTIES
   INSTALL_RPATH "")
 install(TARGETS ceph-osd DESTINATION bin)
 
+endif(NOT WIN32)
+
 if (WITH_CEPHFS)
   add_subdirectory(mds)
   set(ceph_mds_srcs
diff --git a/src/cls/CMakeLists.txt b/src/cls/CMakeLists.txt
index be7544a7866..50ec40090e1 100644
--- a/src/cls/CMakeLists.txt
+++ b/src/cls/CMakeLists.txt
@@ -231,21 +231,23 @@ if (WITH_CEPHFS)
 
 endif (WITH_CEPHFS)
 
-# cls_lua
-set(cls_lua_srcs
-    lua/cls_lua.cc
-    lua/lua_bufferlist.cc)
-add_library(cls_lua SHARED ${cls_lua_srcs})
-set_target_properties(cls_lua PROPERTIES
-  VERSION "1.0.0"
-  SOVERSION "1"
-  INSTALL_RPATH ""
-  CXX_VISIBILITY_PRESET hidden)
-install(TARGETS cls_lua DESTINATION ${cls_dir})
-target_link_libraries(cls_lua
-    ${LUA_LIBRARIES}
-    json_spirit)
-target_include_directories(cls_lua PRIVATE "${LUA_INCLUDE_DIR}")
+if (NOT WIN32)
+  # cls_lua
+  set(cls_lua_srcs
+      lua/cls_lua.cc
+      lua/lua_bufferlist.cc)
+  add_library(cls_lua SHARED ${cls_lua_srcs})
+  set_target_properties(cls_lua PROPERTIES
+    VERSION "1.0.0"
+    SOVERSION "1"
+    INSTALL_RPATH ""
+    CXX_VISIBILITY_PRESET hidden)
+  install(TARGETS cls_lua DESTINATION ${cls_dir})
+  target_link_libraries(cls_lua
+      ${LUA_LIBRARIES}
+      json_spirit)
+  target_include_directories(cls_lua PRIVATE "${LUA_INCLUDE_DIR}")
+endif (NOT WIN32)
 
 set(cls_lua_client_srcs
     lua/cls_lua_client.cc)
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index bf108bd87fd..b2a41b2e52b 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -17,16 +17,15 @@ endif()
 install(TARGETS rados DESTINATION bin)
 
 if(NOT WIN32)
-set(neorados_srcs
-  neorados.cc)
-add_executable(neorados ${neorados_srcs})
-target_include_directories(neorados PRIVATE
-  $<TARGET_PROPERTY:spawn,INTERFACE_INCLUDE_DIRECTORIES>)
+  set(neorados_srcs
+      neorados.cc)
+  add_executable(neorados ${neorados_srcs})
+  target_include_directories(neorados PRIVATE
+    $<TARGET_PROPERTY:spawn,INTERFACE_INCLUDE_DIRECTORIES>)
+  target_link_libraries(neorados libneorados spawn ${CMAKE_DL_LIBS})
+  #install(TARGETS neorados DESTINATION bin)
 endif()
 
-target_link_libraries(neorados libneorados spawn ${CMAKE_DL_LIBS})
-#install(TARGETS neorados DESTINATION bin)
-
 if(WITH_TESTS)
 add_executable(ceph_scratchtool scratchtool.c)
 target_link_libraries(ceph_scratchtool librados global)