Remove Req lib, use code instead
This commit is contained in:
@@ -50,10 +50,6 @@ endif()
|
||||
find_package(Qt5 COMPONENTS Core Widgets Gui Sql Network Multimedia MultimediaWidgets WebEngineWidgets REQUIRED)
|
||||
find_package(DCMTK REQUIRED)
|
||||
|
||||
set(Req_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdParty/Req/pub/cmake")
|
||||
find_package(Req REQUIRED)
|
||||
message(${Req_INCLUDES_DIRS})
|
||||
|
||||
include_directories(${DCMTK_INCLUDE_DIRS})
|
||||
|
||||
|
||||
@@ -83,11 +79,6 @@ if(${DCMTK_FOUND})
|
||||
target_link_libraries(${PROJECT_NAME} dcmnet)
|
||||
endif()
|
||||
|
||||
if(${Req_FOUND})
|
||||
target_include_directories(${PROJECT_NAME} PUBLIC ${Req_INCLUDES_DIRS})
|
||||
target_link_libraries(${PROJECT_NAME} Req)
|
||||
endif()
|
||||
|
||||
target_compile_definitions(${PROJECT_NAME}
|
||||
PRIVATE
|
||||
# If the debug configuration pass the DEBUG define to the compiler
|
||||
@@ -114,9 +105,12 @@ if(UNIX )
|
||||
message("Build With System QT" )
|
||||
link_directories( "/usr/lib64")
|
||||
target_link_libraries(${PROJECT_NAME} Qt5Core.so Qt5Widgets.so Qt5Gui.so Qt5Sql.so Qt5Network.so Qt5Multimedia.so Qt5MultimediaWidgets.so Qt5WebEngineWidgets.so pthread)
|
||||
target_link_libraries(${PROJECT_NAME} curl)
|
||||
|
||||
else()
|
||||
message("Build With packaged QT" )
|
||||
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::Sql Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::WebEngineWidgets pthread)
|
||||
target_link_libraries(${PROJECT_NAME} curl)
|
||||
endif(Build_With_System_QT)
|
||||
else()
|
||||
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::Sql Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::WebEngineWidgets)
|
||||
|
||||
Reference in New Issue
Block a user