From: Sage Weil <sage@newdream.net>
Date: Wed, 7 Jun 2017 21:00:10 +0000 (-0500)
Subject: Merge pull request #15516 from javacruft/i386-cmake-fixes
X-Git-Tag: v12.1.0~232
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c011314b774f07b221f6016d08f2f668cea7ca5d;p=ceph-ci.git

Merge pull request #15516 from javacruft/i386-cmake-fixes

cmake: misc fixes for build on i386

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

c011314b774f07b221f6016d08f2f668cea7ca5d
diff --cc src/CMakeLists.txt
index 37462a162ee,30c3381042e..3582ad30a9b
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -886,23 -886,21 +886,23 @@@ add_subdirectory(compressor
  
  add_subdirectory(tools)
  
 -# dmClock
 -
 -add_subdirectory(dmclock) # after gmock
 -add_dependencies(tests dmclock-tests dmclock-data-struct-tests)
 -
 -if(WITH_TESTS)
 -  install(PROGRAMS
 -    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/dmclock-tests
 -    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/dmclock-data-struct-tests
 -    DESTINATION bin)
 -endif(WITH_TESTS)
 +# dmClock (after gmock)
 +
 +add_subdirectory(dmclock/src)
 +
 +option(WITH_DMCLOCK_TESTS
 +  "enable the build of dmclock-tests and dmclock-data-struct tests binaries"
 +  OFF)
 +if(WITH_TESTS AND WITH_DMCLOCK_TESTS)
 +  # note: add_test is not being called, so dmclock tests aren't part
 +  # of ceph tests
 +  add_subdirectory(dmclock/test)
 +  add_subdirectory(dmclock/support/test)
 +endif(WITH_TESTS AND WITH_DMCLOCK_TESTS)
  
- if(HAVE_INTEL)
+ if(HAVE_INTEL AND HAVE_BETTER_YASM_ELF64)
    add_subdirectory(crypto/isa-l)
- endif(HAVE_INTEL)
+ endif(HAVE_INTEL AND HAVE_BETTER_YASM_ELF64)
  
  if(WITH_TESTS)