[lib] Merge librepackdc into libpcf

libopenfpga/CMakeLists.txt

@@ -4,7 +4,6 @@ add_subdirectory(libopenfpgashell)
 add_subdirectory(libarchopenfpga)
 add_subdirectory(libopenfpgautil)
 add_subdirectory(libfabrickey)
-add_subdirectory(librepackdc)
 add_subdirectory(libfpgabitstream)
 add_subdirectory(libpcf)
 add_subdirectory(libbusgroup)

libopenfpga/libpcf/CMakeLists.txt

@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.9)
 project("libpcf")
 
 file(GLOB_RECURSE EXEC_SOURCES test/*.cpp)
-file(GLOB_RECURSE LIB_SOURCES src/*.cpp)
+file(GLOB_RECURSE LIB_SOURCES src/*/*.cpp)
-file(GLOB_RECURSE LIB_HEADERS src/*.h)
+file(GLOB_RECURSE LIB_HEADERS src/*/*.h)
 files_to_dirs(LIB_HEADERS LIB_INCLUDE_DIRS)
 
 #Remove test executable from library

libopenfpga/librepackdc/CMakeLists.txt

@@ -1,35 +0,0 @@
-cmake_minimum_required(VERSION 3.9)
-
-project("librepackdc")
-
-file(GLOB_RECURSE EXEC_SOURCES test/*.cpp)
-file(GLOB_RECURSE LIB_SOURCES src/*.cpp)
-file(GLOB_RECURSE LIB_HEADERS src/*.h)
-files_to_dirs(LIB_HEADERS LIB_INCLUDE_DIRS)
-
-#Remove test executable from library
-list(REMOVE_ITEM LIB_SOURCES ${EXEC_SOURCES})
-
-#Create the library
-add_library(librepackdc STATIC
-            ${LIB_HEADERS}
-            ${LIB_SOURCES})
-target_include_directories(librepackdc PUBLIC ${LIB_INCLUDE_DIRS})
-set_target_properties(librepackdc PROPERTIES PREFIX "") #Avoid extra 'lib' prefix
-
-#Specify link-time dependancies
-target_link_libraries(librepackdc
-                      libopenfpgautil
-                      libarchopenfpga
-                      libvtrutil
-                      libpugixml
-                      libpugiutil)
-
-#Create the test executable
-foreach(testsourcefile ${EXEC_SOURCES})
-    # Use a simple string replace, to cut off .cpp.
-    get_filename_component(testname ${testsourcefile} NAME_WE)
-    add_executable(${testname} ${testsourcefile})
-    # Make sure the library is linked to each test executable
-    target_link_libraries(${testname} librepackdc)
-endforeach(testsourcefile ${EXEC_SOURCES})

openfpga/CMakeLists.txt

@@ -23,7 +23,6 @@ target_link_libraries(libopenfpga
                       libopenfpgashell
                       libopenfpgautil
                       libfabrickey
-                      librepackdc
                       libfpgabitstream
                       libini
                       libpcf