casa-mp-base
Public
Commits
Andrew Stromnov authored fd7ebb0b521
| 1 - | --- CMakeLists.txt.orig 2016-02-03 21:18:25.000000000 +0300 |
| 2 - | +++ CMakeLists.txt 2016-02-04 14:39:51.000000000 +0300 |
| 3 - | |
| 4 - | set(DYND_LINK_LIBS cephes datetime) |
| 1 + | --- CMakeLists.txt.orig 2016-03-20 16:56:09.000000000 +0300 |
| 2 + | +++ CMakeLists.txt 2016-03-20 16:58:36.000000000 +0300 |
| 3 + | |
| 4 + | #llvm_map_components_to_libnames(LLVM_LINK_LIBS core option target bitreader support profiledata codegen irreader linker instrumentation objcarcopts lto) |
| 5 5 | |
| 6 6 | # Get the git revision |
| 7 7 | -include(GetGitRevisionDescriptionDyND) |
| 8 8 | -get_git_head_revision("${CMAKE_CURRENT_SOURCE_DIR}" GIT_REFSPEC DYND_GIT_SHA1) |
| 9 9 | -git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_VERSION_STRING |
| 10 10 | - --dirty --always --match "v*") |
| 11 11 | +SET(DYND_GIT_SHA1 "@@DYND_GIT_SHA1@@") |
| 12 12 | +SET(DYND_VERSION_STRING "@@DYND_VERSION_STRING@@") |
| 13 13 | message(STATUS "DyND version: ${DYND_VERSION_STRING}") |
| 14 14 | configure_file( |
| 15 15 | "${CMAKE_CURRENT_SOURCE_DIR}/src/dynd/git_version.cpp.in" |
| 16 - | |
| 17 - | PREFIX "lib" |
| 18 - | IMPORT_PREFIX "lib" |
| 19 - | ) |
| 20 - | -elseif(APPLE) |
| 16 + | |
| 17 + | configure_file("include/dynd/cmake_config.hpp.in" |
| 18 + | "${CMAKE_CURRENT_BINARY_DIR}/include/dynd/cmake_config.hpp") |
| 19 + | |
| 20 + | -if(APPLE) |
| 21 21 | - # The rpath stuff is confusing, and this is our attempt to get it right. |
| 22 22 | - # It's been complicated by a bug in certain versions of CMake that plays |
| 23 23 | - # particularly badly with CUDA. If anyone knows the "right" way to do this, |
| 24 24 | - # that would be great. |
| 25 25 | - # |
| 26 26 | - # See http://stackoverflow.com/questions/22885207/opencv-and-pcl-builds-on-osx-result-in-malformed-object-load-command-cmdsize |
| 27 27 | - # |
| 28 + | - set_target_properties(libdyndt |
| 29 + | - PROPERTIES |
| 30 + | - BUILD_WITH_INSTALL_RPATH ON |
| 31 + | - INSTALL_NAME_DIR "@rpath" |
| 32 + | - ) |
| 28 33 | - set_target_properties(libdynd |
| 29 34 | - PROPERTIES |
| 30 35 | - BUILD_WITH_INSTALL_RPATH ON |
| 31 36 | - INSTALL_NAME_DIR "@rpath" |
| 32 37 | - ) |
| 33 - | endif() |
| 34 - | |
| 38 + | -endif() |
| 39 + | - |
| 35 40 | if (DYND_SHARED_LIB OR (NOT DYND_INSTALL_LIB)) |
| 41 + | # If we're not making an installable static library, |
| 42 + | # link the sublibraries normally |