fixup patch for 0.0.3

This commit is contained in:
Neil Hanlon 2023-01-26 21:27:01 -05:00
parent 698eed3aa1
commit 581bde9d2c
Signed by: neil
GPG Key ID: 705BC21EC3C70F34

View File

@ -1,7 +1,7 @@
diff -ru blisp-0.0.2/CMakeLists.txt blisp-0.0.2-b/CMakeLists.txt diff -ru blisp-0.0.2/CMakeLists.txt blisp-0.0.2-b/CMakeLists.txt
--- blisp-0.0.2/CMakeLists.txt 2023-01-12 05:49:04.000000000 -0500 --- blisp-0.0.2/CMakeLists.txt 2023-01-12 05:49:04.000000000 -0500
+++ blisp-0.0.2-b/CMakeLists.txt 2023-01-12 14:31:14.092073606 -0500 +++ blisp-0.0.2-b/CMakeLists.txt 2023-01-12 14:31:14.092073606 -0500
@@ -32,29 +32,18 @@ @@ -32,30 +32,19 @@
ARCHIVE_OUTPUT_DIRECTORY "static" ARCHIVE_OUTPUT_DIRECTORY "static"
OUTPUT_NAME "blisp") OUTPUT_NAME "blisp")
@ -12,7 +12,8 @@ diff -ru blisp-0.0.2/CMakeLists.txt blisp-0.0.2-b/CMakeLists.txt
-target_include_directories(libblisp_obj PRIVATE ${CMAKE_SOURCE_DIR}/vendor/libserialport) -target_include_directories(libblisp_obj PRIVATE ${CMAKE_SOURCE_DIR}/vendor/libserialport)
- -
if(WIN32) if(WIN32)
target_link_libraries(libblisp_obj PRIVATE Setupapi.lib) target_link_libraries(libblisp PRIVATE Setupapi.lib)
target_link_libraries(libblisp_static PRIVATE Setupapi.lib)
target_compile_definitions(libblisp_obj PRIVATE LIBSERIALPORT_MSBUILD) target_compile_definitions(libblisp_obj PRIVATE LIBSERIALPORT_MSBUILD)
target_sources(libblisp_obj PRIVATE target_sources(libblisp_obj PRIVATE
${CMAKE_SOURCE_DIR}/vendor/libserialport/windows.c) ${CMAKE_SOURCE_DIR}/vendor/libserialport/windows.c)
@ -87,7 +88,6 @@ diff -ru blisp-0.0.2/CMakeLists.txt blisp-0.0.2-b/CMakeLists.txt
+install(FILES "${PROJECT_BINARY_DIR}/${BLISP_PACKAGE_NAME}ConfigVersion.cmake" +install(FILES "${PROJECT_BINARY_DIR}/${BLISP_PACKAGE_NAME}ConfigVersion.cmake"
+ DESTINATION ${BLISP_INSTALL_CMAKEDIR} + DESTINATION ${BLISP_INSTALL_CMAKEDIR}
+) +)
diff -ru blisp-0.0.2/tools/blisp/CMakeLists.txt blisp-0.0.2-b/tools/blisp/CMakeLists.txt
--- blisp-0.0.2/tools/blisp/CMakeLists.txt 2023-01-12 05:49:04.000000000 -0500 --- blisp-0.0.2/tools/blisp/CMakeLists.txt 2023-01-12 05:49:04.000000000 -0500
+++ blisp-0.0.2-b/tools/blisp/CMakeLists.txt 2023-01-12 14:20:35.839890965 -0500 +++ blisp-0.0.2-b/tools/blisp/CMakeLists.txt 2023-01-12 14:20:35.839890965 -0500
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@