--- CMakeLists.txt.orig 2016-03-20 16:56:09.000000000 +0300
+++ CMakeLists.txt 2016-03-20 16:58:36.000000000 +0300
#llvm_map_components_to_libnames(LLVM_LINK_LIBS core option target bitreader support profiledata codegen irreader linker instrumentation objcarcopts lto)
-include(GetGitRevisionDescriptionDyND)
-get_git_head_revision("${CMAKE_CURRENT_SOURCE_DIR}" GIT_REFSPEC DYND_GIT_SHA1)
-git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_VERSION_STRING
- --dirty --always --match "v*")
+SET(DYND_GIT_SHA1 "@@DYND_GIT_SHA1@@")
+SET(DYND_VERSION_STRING "@@DYND_VERSION_STRING@@")
message(STATUS "DyND version: ${DYND_VERSION_STRING}")
"${CMAKE_CURRENT_SOURCE_DIR}/src/dynd/git_version.cpp.in"
configure_file("include/dynd/cmake_config.hpp.in"
"${CMAKE_CURRENT_BINARY_DIR}/include/dynd/cmake_config.hpp")
- # The rpath stuff is confusing, and this is our attempt to get it right.
- # It's been complicated by a bug in certain versions of CMake that plays
- # particularly badly with CUDA. If anyone knows the "right" way to do this,
- # See http://stackoverflow.com/questions/22885207/opencv-and-pcl-builds-on-osx-result-in-malformed-object-load-command-cmdsize
- set_target_properties(libdyndt
- BUILD_WITH_INSTALL_RPATH ON
- INSTALL_NAME_DIR "@rpath"
- set_target_properties(libdynd
- BUILD_WITH_INSTALL_RPATH ON
- INSTALL_NAME_DIR "@rpath"
if (DYND_SHARED_LIB OR (NOT DYND_INSTALL_LIB))
# If we're not making an installable static library,
# link the sublibraries normally