Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove use of empty var QT_LIBRARIES and use VTK_LIBRARIES and ITK_LIBRARIES… #610

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

remove use of empty var QT_LIBRARIES and use VTK_LIBRARIES and ITK_LIBRARIES… #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
261d4f4
remove empty var QT_LIBRARIES and use VTK_LIBRARIES and ITK_LIBRARIES…
Apr 16, 2020
5a418a9
move include_dir to target
Apr 16, 2020
75cabc8
remove comment
Apr 16, 2020
c5dfe0b
remove depencies that are available with target features, improve cma…
Apr 17, 2020
05406c9
improve cmake plugin version setting, use target_compile_definition i…
Apr 20, 2020
17fe7fe
change comment syntax(asked by reviewer)
Apr 21, 2020
13ff268
replace include_directories for dtk in plugins with target_include_di…
Apr 22, 2020
77660ac
remove include include() because it old style cmakereplace with inclu…
Apr 22, 2020
05b9cb8
reduce vtk components required : most of them come free; remove inclu…
Apr 22, 2020
c35ead1
make private headers, improve some compilation def
Apr 23, 2020
3cd53d3
remove find dtk in plugins since like Qt, the find is done on the mai…
Apr 24, 2020
6b15a10
add target_sources target_include_directories target_link_libraries t…
Apr 24, 2020
b9f9c13
add some target_compile_definitions and target_compile_options
Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ endif()

project(medInria VERSION ${medInria_VERSION})


## #############################################################################
## Set version
## #############################################################################
Expand Down Expand Up @@ -106,8 +105,6 @@ if(APPLE)
set(CMAKE_MACOSX_RPATH OFF)
endif()



## #############################################################################
## Qt Auto tools
## #############################################################################
Expand Down
54 changes: 23 additions & 31 deletions src/app/medInria/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ set(TARGET_NAME medInria)
add_subdirectory(QSingleApplication)
add_subdirectory(resources)

find_package(dtk REQUIRED)
include_directories(${dtk_INCLUDE_DIRS})

list_source_files(${TARGET_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
areas/browser
Expand All @@ -44,17 +41,6 @@ list_header_directories_to_include(${TARGET_NAME}
${${TARGET_NAME}_HEADERS}
)


## #############################################################################
## Add preproc if we have revisions from the super project
## #############################################################################

if (EXISTS ${CMAKE_BINARY_DIR}/revisions/medRevisions.h)
include_directories(${CMAKE_BINARY_DIR}/revisions)
add_definitions(-D${PROJECT_NAME}_HAS_REVISIONS)
endif()


## #############################################################################
## Add preproc if we want immersive room stuff
## #############################################################################
Expand All @@ -63,16 +49,6 @@ option(ACTIVATE_WALL_OPTION
"Activate the command line option --wall (INRIA Sophia, immersive room)"
OFF
)
if (ACTIVATE_WALL_OPTION)
add_definitions(-DACTIVATE_WALL_OPTION)
endif()

## #############################################################################
## Variable
## #############################################################################

string(TIMESTAMP BUILD_DATE "\"%d_%m_%Y\"")
add_definitions(-DMEDINRIA_BUILD_DATE=${BUILD_DATE})

## #############################################################################
## OS specificites
Expand All @@ -85,16 +61,14 @@ if(WIN32)
)
endif()


if (APPLE)
set(DEPLOYMENT_SYSTEM MACOSX_BUNDLE)
endif()
if (WIN32)

if (WIN32)
if(NOT ${MED_SHOW_CONSOLE} )
set(DEPLOYMENT_SYSTEM WIN32)
endif()

set(${TARGET_NAME}_RC resources/medInria.rc)
endif()

Expand All @@ -104,7 +78,7 @@ endif()

add_executable(${TARGET_NAME} ${DEPLOYMENT_SYSTEM} # Empty for Linux
${${TARGET_NAME}_CFILES}
${${TARGET_NAME}_QRC}
"${${TARGET_NAME}_QRC}"
${${TARGET_NAME}_QSS} # Just to have it in EDI
${${TARGET_NAME}_RC} # Empty for Unix
${${TARGET_NAME}_HTML}
Expand All @@ -115,13 +89,32 @@ if (APPLE)
endif()

## #############################################################################
## include directorie.
## Add definition and options
## #############################################################################

target_compile_definitions(${TARGET_NAME} PUBLIC
$<$<BOOL:${ACTIVATE_WALL_OPTION}>:ACTIVATE_WALL_OPTION>
)

## Add preproc if we have revisions from the super project

if (EXISTS ${CMAKE_BINARY_DIR}/revisions/medRevisions.h)
target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_BINARY_DIR}/revisions)
target_compile_definitions( ${TARGET_NAME} PUBLIC ${PROJECT_NAME}_HAS_REVISIONS)
endif()

## Variable
string(TIMESTAMP BUILD_DATE "\"%d_%m_%Y\"")
target_compile_definitions( ${TARGET_NAME} PUBLIC MEDINRIA_BUILD_DATE=${BUILD_DATE})

## #############################################################################
## include directories.
## #############################################################################

target_include_directories(${TARGET_NAME}
PRIVATE ${${TARGET_NAME}_INCLUDE_DIRS}
PRIVATE ${dtk_INCLUDE_DIRS}
)
# PRIVATE beacause application is not supposed to be used somewhere else

## #############################################################################
## Links.
Expand All @@ -143,7 +136,6 @@ target_link_libraries(${TARGET_NAME}
medPacs
)


## #############################################################################
## install
## #############################################################################
Expand Down
2 changes: 1 addition & 1 deletion src/app/medInria/resources/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ file(GLOB ${TARGET_NAME}_QRC
*.qrc
)
set(${TARGET_NAME}_QRC
${${TARGET_NAME}_QRC}
"${${TARGET_NAME}_QRC}"
PARENT_SCOPE
)

Expand Down
13 changes: 10 additions & 3 deletions src/layers/legacy/medCoreLegacy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,19 @@ list_header_directories_to_include(${TARGET_NAME}
## #############################################################################

add_library(${TARGET_NAME} SHARED
${${TARGET_NAME}_CFILES}
${${TARGET_NAME}_QRC}
"${${TARGET_NAME}_QRC}"
)

## #############################################################################
## include directorie.
## source
## #############################################################################
target_sources(${TARGET_NAME}
PRIVATE ${${TARGET_NAME}_SOURCES}
PUBLIC ${${TARGET_NAME}_TEMPLATES}
PUBLIC ${${TARGET_NAME}_HEADERS}
)
## #############################################################################
## include directories.
## #############################################################################

target_include_directories(${TARGET_NAME}
Expand Down
66 changes: 31 additions & 35 deletions src/layers/legacy/medImageIO/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,25 @@ set(TARGET_NAME medImageIO)
## #############################################################################
## find requireds
## #############################################################################

find_package(ITK REQUIRED COMPONENTS ITKVtkGlue ITKIOImageBase ITKIOMeta)
include(${ITK_USE_FILE})

#WARNING USE VTK through ITKVtkGlue and medLog
set(ITK_IMAGES_DEPENDENCIES
ITKIOImageBase
ITKIOMeta
#common formats for common images
ITKIOBMP ITKIOJPEG ITKIOJPEG2000 ITKIOPNG ITKIOTIFF
#Medical images formats
ITKIOGIPL ITKIONRRD ITKIONIFTI ITKIOGIPL ITKIOPhilipsREC ITKIOGDCM ITKIOBioRad ITKIOBruker
ITKNrrdIO ITKIOMINC ITKIOHDF5 ITKIOMRC ITKIOLSM
)

# ITKCommon ITKIOImageBase
find_package(ITK REQUIRED COMPONENTS ${ITK_IMAGES_DEPENDENCIES} ITKIOVTK ITKIOGIPL ITKIOGE
ITKIOStimulate ITKVTK ITKVtkGlue )

# find vtk
find_package(VTK REQUIRED COMPONENTS vtkIOImage)

find_package(DCMTK REQUIRED NO_MODULE)


## #############################################################################
## List Sources
## #############################################################################
Expand All @@ -44,56 +54,42 @@ list_header_directories_to_include(${TARGET_NAME}
## #############################################################################

add_library(${TARGET_NAME} SHARED
${${TARGET_NAME}_CFILES}
"${${TARGET_NAME}_QRC}"
)

## #############################################################################
## include directorie.
## source
## #############################################################################
target_sources(${TARGET_NAME}
PRIVATE ${${TARGET_NAME}_SOURCES}
PUBLIC ${${TARGET_NAME}_TEMPLATES}
PUBLIC ${${TARGET_NAME}_HEADERS}
)

## #############################################################################
## include directories.
## #############################################################################

target_include_directories(${TARGET_NAME}
PUBLIC ${${TARGET_NAME}_INCLUDE_DIRS}
PRIVATE ${DCMTK_INCLUDE_DIRS}
PUBLIC ${ITK_INCLUDE_DIRS}
PRIVATE ${VTK_INCLUDE_DIRS}
)


## #############################################################################
## Link
## #############################################################################


target_link_libraries(${TARGET_NAME}
Qt5::Core
Qt5::Widgets
${ITK_LIBRARIES}
${VTK_LIBRARIES}
dtkCoreSupport
dtkLog
medCore
medCoreLegacy
ITKCommon
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm curious, why do you prefer them in the find_package than here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like to put them in the find required section. And I hope that one time I could remove most of them .

ITKIOImageBase
ITKIOBMP
ITKIOBruker
ITKIOLSM
ITKIOJPEG
ITKIOJPEG2000
ITKIOPNG
ITKIOVTK
ITKIOGDCM
ITKNrrdIO
ITKIONRRD
ITKIOMeta
ITKIOMINC
ITKIONIFTI
ITKIOGIPL
ITKIOGE
ITKIOHDF5
ITKIOBioRad
ITKIOStimulate
ITKIOMRC
ITKIOTIFF
ITKVTK
vtkIOImage
${ITKIOPhilipsREC_LIBRARIES}
${DCMTK_LIBRARIES}
)

Expand Down
32 changes: 16 additions & 16 deletions src/layers/legacy/medLog/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,8 @@ set(TARGET_NAME medLog)
## find requireds
## #############################################################################

# find dtk
find_package(dtk REQUIRED)
include_directories(${dtk_INCLUDE_DIRS})

# find itk
find_package(ITK REQUIRED COMPONENTS ITKCommon)
include(${ITK_USE_FILE})

# find vtk
find_package(VTK REQUIRED COMPONENTS vtkCommonCore)
include(${VTK_USE_FILE})


## #############################################################################
## List Sources
Expand All @@ -44,25 +34,35 @@ list_header_directories_to_include(${TARGET_NAME}
${${TARGET_NAME}_HEADERS}
)


## #############################################################################
## add library
## #############################################################################

add_library(${TARGET_NAME} SHARED
${${TARGET_NAME}_CFILES}
"${${TARGET_NAME}_QRC}"
)

## #############################################################################
## source
## #############################################################################
target_sources(${TARGET_NAME}
PRIVATE ${${TARGET_NAME}_SOURCES}
PUBLIC ${${TARGET_NAME}_TEMPLATES}
PUBLIC ${${TARGET_NAME}_HEADERS}
)


## #############################################################################
## include directorie.
## include directories.
## #############################################################################

target_include_directories(${TARGET_NAME}
PUBLIC ${${TARGET_NAME}_INCLUDE_DIRS}
PUBLIC ${dtk_INCLUDE_DIRS}
PRIVATE ${ITK_INCLUDE_DIRS}
PRIVATE ${VTK_INCLUDE_DIRS}
)


## #############################################################################
## Link
## #############################################################################
Expand All @@ -72,8 +72,8 @@ target_link_libraries(${TARGET_NAME}
Qt5::Widgets
dtkCoreSupport
dtkLog
ITKCommon
vtkCommonCore
${ITK_LIBRARIES}
${VTK_LIBRARIES}
)

## #############################################################################
Expand Down
34 changes: 21 additions & 13 deletions src/layers/legacy/medPacs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,26 @@ list_header_directories_to_include(${TARGET_NAME}
${${TARGET_NAME}_HEADERS}
)

## #############################################################################
## Add definition
## #############################################################################

if (NOT MSVC) #TODO : what is it for ?
add_definitions(-Wno-write-strings)
add_definitions(-Wformat=0)
endif()


## #############################################################################
## add library
## #############################################################################

add_library(${TARGET_NAME} SHARED
${${TARGET_NAME}_CFILES}
"${${TARGET_NAME}_QRC}"
)

## #############################################################################
## Add definition and options
## #############################################################################

if (NOT MSVC) #TODO : what is it for ?
target_compile_options(${TARGET_NAME} PRIVATE "-Wno-write-strings")
target_compile_options(${TARGET_NAME} PRIVATE "-Wformat=0")
endif()

target_compile_definitions(${TARGET_NAME} PUBLIC
$<$<BOOL:${USE_OSPRay}>:MED_USE_OSPRAY_4_VR_BY_CPU>
)
## #############################################################################
## Link
## #############################################################################
Expand All @@ -59,14 +60,21 @@ target_link_libraries(${TARGET_NAME}
)

## #############################################################################
## include directorie.
## source
## #############################################################################
target_sources(${TARGET_NAME}
PRIVATE ${${TARGET_NAME}_SOURCES}
PUBLIC ${${TARGET_NAME}_TEMPLATES}
PUBLIC ${${TARGET_NAME}_HEADERS}
)
## #############################################################################
## include directories.
## #############################################################################

target_include_directories(${TARGET_NAME}
PUBLIC ${${TARGET_NAME}_INCLUDE_DIRS}
)


## #############################################################################
## install
## #############################################################################
Expand Down
Loading