gnu/packages/patches/rtags-separate-rct.patch

   1 Unbundle RCT and use our own copy.
   2
   3 --- rtags-2.16/src/CMakeLists.txt       2018-01-23 10:36:17.645855140 +0100
   4 +++ rtags-2.16/src/CMakeLists.txt       2018-01-23 10:38:14.605234740 +0100
   5 @@ -105,12 +105,6 @@ if (LUA_ENABLED)
   6          CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
   7  endif ()
   8
   9 -set(RCT_RTTI_ENABLED 1)
  10 -set(RCT_NO_INSTALL 1)
  11 -set(RCT_NO_LIBRARY 1)
  12 -# Everyting which as been set either in rct/rct.cmake or rct/compiler.cmake
  13 -# doesn't need to be set in this file again.
  14 -include(rct/rct.cmake)
  15
  16  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing=2 -Wcast-qual -fPIC")
  17  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-aliasing=2 -Wcast-qual -fPIC")
  18 @@ -128,8 +122,7 @@ add_definitions(
  19      "-DRTAGS_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
  20      "-DCLANG_LIBDIR=${LIBCLANG_LIBDIR}"
  21      "-DCLANG_VERSION=${LIBCLANG_VERSION_STRING}"
  22 -    "-DOS_${CMAKE_SYSTEM_NAME}"
  23 -    ${RCT_DEFINITIONS})
  24 +    "-DOS_${CMAKE_SYSTEM_NAME}")
  25
  26  if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
  27      add_definitions(-D__LONG_LONG_SUPPORTED)
  28 @@ -172,8 +165,7 @@ set(RTAGS_SOURCES
  29      Symbol.cpp
  30      SymbolInfoJob.cpp
  31      Token.cpp
  32 -    TokensJob.cpp
  33 -    ${RCT_SOURCES})
  34 +    TokensJob.cpp)
  35
  36  if (LUA_ENABLED)
  37      list(APPEND RTAGS_SOURCES AST.cpp)
  38 @@ -195,10 +187,10 @@ endif ()
  39
  40  include_directories(
  41      ${CMAKE_CURRENT_LIST_DIR}
  42 -    ${RCT_INCLUDE_DIRS}
  43      ${CMAKE_CURRENT_LIST_DIR}/selene/include
  44      ${CMAKE_CURRENT_BINARY_DIR}/lua-prefix/src/lua-build
  45 -    ${CMAKE_CURRENT_LIST_DIR}/lua/src)
  46 +    ${CMAKE_CURRENT_LIST_DIR}/lua/src
  47 +    ${CMAKE_CURRENT_BINARY_DIR}/include)
  48
  49  if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
  50      set(START_GROUP "")
  51 @@ -223,17 +215,17 @@ else ()
  52  endif()
  53
  54  # RCT_LIBRARIES and stdc++ library must be at the end
  55 -set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++ ${RCT_LIBRARIES})
  56 +set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++)
  57  add_executable(rc rc.cpp)
  58 -target_link_libraries(rc ${RTAGS_LIBRARIES})
  59 +target_link_libraries(rc ${RTAGS_LIBRARIES} rct)
  60
  61  add_executable(rdm rdm.cpp)
  62 -target_link_libraries(rdm ${RTAGS_LIBRARIES})
  63 +target_link_libraries(rdm ${RTAGS_LIBRARIES} rct)
  64
  65  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
  66
  67  add_executable(rp rp.cpp)
  68 -target_link_libraries(rp ${RTAGS_LIBRARIES})
  69 +target_link_libraries(rp ${RTAGS_LIBRARIES} rct)
  70
  71  if (CYGWIN)
  72      EnsureLibraries(rdm rct)