pkgs/development/tools/luaformatter/fix-lib-paths.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index 4a21b94..0ac7911 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -67,10 +67,10 @@ endif()
   6
   7  include_directories(
   8    ${PROJECT_SOURCE_DIR}/generated/
   9 -  ${PROJECT_SOURCE_DIR}/third_party/
  10 -  ${PROJECT_SOURCE_DIR}/third_party/Catch2/single_include
  11 -  ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/include
  12 -  ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src
  13 +  @libargs@/include
  14 +  @catch2@/include
  15 +  @yaml-cpp@/include
  16 +  @antlr4RuntimeCpp@/include/antlr4-runtime
  17    ${PROJECT_SOURCE_DIR}/src/
  18    )
  19
  20 @@ -92,9 +92,6 @@ file(GLOB_RECURSE yaml-cpp-src
  21    ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/src/*.cpp
  22    )
  23
  24 -add_library (antlr4-cpp-runtime ${antlr4-cpp-src})
  25 -add_library (yaml-cpp ${yaml-cpp-src})
  26 -
  27  add_executable(lua-format ${src_dir} src/main.cpp)
  28
  29  if(WIN32)
  30 @@ -104,7 +101,7 @@ endif()
  31
  32  set_target_properties(lua-format PROPERTIES LINKER_LANGUAGE CXX)
  33
  34 -target_link_libraries(lua-format yaml-cpp antlr4-cpp-runtime ${extra-libs})
  35 +target_link_libraries(lua-format yaml-cpp antlr4-runtime ${extra-libs})
  36
  37  install(TARGETS lua-format
  38    RUNTIME DESTINATION bin
  39 @@ -135,7 +132,7 @@ if(BUILD_TESTS)
  40    endif()
  41
  42    target_compile_definitions(lua-format-test PUBLIC PROJECT_PATH="${PROJECT_SOURCE_DIR}")
  43 -  target_link_libraries(lua-format-test yaml-cpp antlr4-cpp-runtime ${extra-libs})
  44 +  target_link_libraries(lua-format-test yaml-cpp antlr4-runtime ${extra-libs})
  45
  46    add_test(NAME args COMMAND lua-format-test [args])
  47    add_test(NAME config COMMAND lua-format-test [config])
  48 diff --git a/src/main.cpp b/src/main.cpp
  49 index 38962a2..332aad6 100644
  50 --- a/src/main.cpp
  51 +++ b/src/main.cpp
  52 @@ -1,4 +1,4 @@
  53 -#include <args/args.hxx>
  54 +#include <args.hxx>
  55  #include <cstdlib>
  56  #include <fstream>
  57  #include <iostream>
  58 diff --git a/test/test_args.cpp b/test/test_args.cpp
  59 index 69a5746..b988d00 100644
  60 --- a/test/test_args.cpp
  61 +++ b/test/test_args.cpp
  62 @@ -1,4 +1,4 @@
  63 -#include <args/args.hxx>
  64 +#include <args.hxx>
  65  #include <catch2/catch.hpp>
  66  #include <iostream>
  67  #include <tuple>