Update to dms control phase1.
This commit is contained in:
@@ -39,6 +39,10 @@ source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${project_c})
|
||||
|
||||
find_package(Qt5 COMPONENTS Core Widgets Gui OpenGL Sql VirtualKeyboard Network Multimedia MultimediaWidgets 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})
|
||||
|
||||
|
||||
@@ -68,6 +72,11 @@ if(${DCMTK_FOUND})
|
||||
target_link_libraries(${PROJECT_NAME} ${DCMTK_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(${Req_FOUND})
|
||||
target_include_directories(${PROJECT_NAME} PUBLIC ${Req_INCLUDES_DIRS})
|
||||
target_link_libraries(${PROJECT_NAME} Req)
|
||||
endif()
|
||||
|
||||
if(NOT UNIX)
|
||||
find_program(POWERSHELL_PATH NAMES powershell)
|
||||
|
||||
@@ -83,10 +92,12 @@ foreach(_file ${TS_FILES})
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
|
||||
set(USE_SHIMLIB ON)
|
||||
if(UNIX AND USE_SHIMLIB)
|
||||
link_directories(/usr/local/lib64)
|
||||
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::OpenGL Qt5::Sql Qt5::VirtualKeyboard Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets pthread usct_shim dmapi log4c cunit ctomat hdf5 matio m)
|
||||
# target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::OpenGL Qt5::Sql Qt5::VirtualKeyboard Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets pthread usct_shim dmapi log4c cunit ctomat hdf5 matio m)
|
||||
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::OpenGL Qt5::Sql Qt5::VirtualKeyboard Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets pthread m)
|
||||
elseif(UNIX)
|
||||
elseif(UNIX)
|
||||
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::OpenGL Qt5::Sql Qt5::VirtualKeyboard Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets pthread)
|
||||
else()
|
||||
|
||||
Reference in New Issue
Block a user