]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: update env vars for osd-copy-from.sh
authorAli Maredia <amaredia@redhat.com>
Wed, 27 Apr 2016 19:27:38 +0000 (15:27 -0400)
committerAli Maredia <amaredia@redhat.com>
Mon, 2 May 2016 14:19:32 +0000 (10:19 -0400)
Signed-off-by: Ali Maredia <amaredia@redhat.com>
src/test/osd/CMakeLists.txt

index 841bab166a0751f0d19e302751f967ca3f688e33..d7cdb7eea8a8eed06a2a183c5acd7183d3bb2ddb 100644 (file)
@@ -33,11 +33,10 @@ set_property(TEST
   CEPH_ROOT=${CMAKE_SOURCE_DIR}
   CEPH_BIN=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
   CEPH_LIB=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+  CEPH_BUILD_DIR=${CMAKE_BINARY_DIR}
   LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib
-  PATH=$ENV{PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src
-  PYTHONPATH=${CMAKE_SOURCE_DIR}/src/pybind
-  )
-
+  PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src:$ENV{PATH}
+  PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules/lib.linux-x86_64-2.7:${CMAKE_SOURCE_DIR}/src/pybind)
 
 # unittest_osdmap
 add_executable(unittest_osdmap EXCLUDE_FROM_ALL