Skip to content

Commit

Permalink
ENH: Improve build targets organization in IDE that support folders
Browse files Browse the repository at this point in the history
This commit sets the FOLDER property on all targets to group them
into meaningful "units". This will make development easier ensuring
it is possible to quickly re-build and open the source files associated
with the targets of any given module.
  • Loading branch information
jcfr authored and hjmjohnson committed Mar 28, 2018
1 parent 1dc60f6 commit a9045b9
Show file tree
Hide file tree
Showing 47 changed files with 157 additions and 3 deletions.
2 changes: 2 additions & 0 deletions ARCHIVE/BRAINSContinuousClass/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ FindITKUtil(BRAINSContinuousClass_ITK
ITKThresholding
)

set(MODULE_FOLDER "Module-BRAINSContinuousClass")

add_subdirectory(liblinear-1.8)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/liblinear-1.8)

Expand Down
5 changes: 5 additions & 0 deletions ARCHIVE/BRAINSContinuousClass/liblinear-1.8/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
##- project( liblinear )

add_library( blas blas/dnrm2.c blas/daxpy.c blas/ddot.c blas/dscal.c blas/blas.h blas/blas.h blas/blasp.h )
set_target_properties(blas PROPERTIES FOLDER ${MODULE_FOLDER})

add_library( tron tron.cpp tron.h )
target_link_libraries(tron blas)
set_target_properties(tron PROPERTIES FOLDER ${MODULE_FOLDER})

add_library( liblinear linear.cpp linear.h )
target_link_libraries(liblinear tron ${BRAINSContinuousClass_ITK_LIBRARIES})
set_target_properties(liblinear PROPERTIES FOLDER ${MODULE_FOLDER})

3 changes: 3 additions & 0 deletions ARCHIVE/BRAINSTalairach/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ set(BRAINSTalairachSupportLib_SRCS
BndToVtk.cxx
)

set(MODULE_FOLDER "Module-BRAINSTalairach")

add_library(BRAINSTalairachSupportLib STATIC ${BRAINSTalairachSupportLib_SRCS})
target_link_libraries(BRAINSTalairachSupportLib BRAINSCommonLib ${VTK_LIBRARIES})
set_target_properties(BRAINSTalairachSupportLib PROPERTIES FOLDER ${MODULE_FOLDER})

#
# To fix compilation problem: relocation R_X86_64_32 against `a local symbol' can not be
Expand Down
2 changes: 2 additions & 0 deletions ARCHIVE/ICCDEF/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ FindITKUtil( ICCDEF_ITK
##- include_directories(${COMMON_BRAINSCOMMONLIB_SOURCE_DIR})
##- link_directories(${COMMON_BRAINSCOMMONLIB_BINARY_DIR})

set(MODULE_FOLDER "Modules-ICCDEF")

if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "/opt/iccdefRegistration_New" CACHE PATH "Install path prefix,
prepended onto install directories." FORCE)
Expand Down
2 changes: 2 additions & 0 deletions ARCHIVE/ICCDEF/TestSuite/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ itkIterativeInverseDisplacementFieldFilterTest2.cxx

add_executable(UnitTests UnitTests.cxx ${UnitTest_SRCS})
target_link_libraries(UnitTests ${ICCDEF_ITK_LIBRARIES} )
set_target_properties(UnitTests PROPERTIES FOLDER ${MODULE_FOLDER})

#add_test(NAME itkVectorFFTWTest COMMAND $<TARGET_FILE:UnitTests>
# --compare ${CMAKE_CURRENT_BINARY_DIR}/transformedImage.nii.gz
Expand All @@ -182,6 +183,7 @@ target_link_libraries(UnitTests ${ICCDEF_ITK_LIBRARIES} )
#target_link_libraries(UnitTests
# ${ICCDEF_ITK_LIBRARIES}
#)
#set_target_properties(UnitTests PROPERTIES FOLDER ${MODULE_FOLDER})

set(UNIT_TEST_TEMP_DIR ${CMAKE_CURRENT_BINARY_DIR})

Expand Down
3 changes: 3 additions & 0 deletions BRAINSABC/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ FindITKUtil(BRAINSABC_ITK
#

###

set(MODULE_FOLDER "Module-BRAINSABC")

add_subdirectory(brainseg)

if(BUILD_TESTING AND NOT BRAINSTools_DISABLE_TESTING)
Expand Down
2 changes: 2 additions & 0 deletions BRAINSABC/TestSuite/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ configure_file( BRAINSABCSmallExtendedAtlasDefinition.xml.in

#add_executable(TestLinearRegressionTesting TestLinearRegresionInstensityMatching.cxx)
#target_link_libraries(TestLinearRegressionTesting BRAINSCommonLib )
#set_target_properties(TestLinearRegressionTesting PROPERTIES FOLDER ${MODULE_FOLDER})

MakeTestDriverFromSEMTool(BRAINSABC BRAINSABCTest.cxx)
add_dependencies(BRAINSABCTestDriver InstallReferenceAtlas) ## Needed to ensure data is installed
Expand Down Expand Up @@ -104,6 +105,7 @@ endif()
if( ${BRAINSTools_MAX_TEST_LEVEL} GREATER 8) # This should be restored after fixing.
add_executable(BlendImageFilterTest BlendImageFilterTest.cxx)
target_link_libraries(BlendImageFilterTest ${BRAINSABC_ITK_LIBRARIES})
set_target_properties(BlendImageFilterTest PROPERTIES FOLDER ${MODULE_FOLDER})
ExternalData_add_test( ${PROJECT_NAME}FetchData NAME BlendImageFilterTest COMMAND ${LAUNCH_EXE} $<TARGET_FILE:BlendImageFilterTest> )
endif()

Expand Down
2 changes: 2 additions & 0 deletions BRAINSABC/brainseg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ add_library(BRAINSABCCOMMONLIB STATIC ${BRAINSABCCOMMONLIB_SRCS})
add_dependencies(BRAINSABCCOMMONLIB InstallReferenceAtlas )
set_property(TARGET BRAINSABCCOMMONLIB PROPERTY CXX_STANDARD 11)
set_property(TARGET BRAINSABCCOMMONLIB PROPERTY CXX_STANDARD_REQUIRED ON)
set_target_properties(BRAINSABCCOMMONLIB PROPERTIES FOLDER ${MODULE_FOLDER})

set(BABC_CXX11_Required_Features
cxx_lambdas
Expand Down Expand Up @@ -76,4 +77,5 @@ if(0)
## A utility program
add_executable(StandardizeMaskIntensity StandardizeMaskIntensity.cxx)
target_link_libraries(StandardizeMaskIntensity ${BRAINSABC_ITK_LIBRARIES})
set_target_properties(StandardizeMaskIntensity PROPERTIES FOLDER ${MODULE_FOLDER})
endif()
3 changes: 3 additions & 0 deletions BRAINSCommonLib/BuildScripts/CMakeBRAINS3BuildMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ macro(MakeTestDriverFromSEMTool SEMToolName SEMToolTestSourceName)
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEFINED MODULE_FOLDER)
set_target_properties(${SEMToolName}TestDriver PROPERTIES FOLDER ${MODULE_FOLDER})
endif()
endmacro()

# DebugImageViewer Macro
Expand Down
3 changes: 3 additions & 0 deletions BRAINSCommonLib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,12 @@ set(BRAINSCommonLib_SRCS
DWIMetaDataDictionaryValidator.cxx
)

set(MODULE_FOLDER "Module-BRAINSCommon")

## Always build BRAINSCommonLib as static
add_library(BRAINSCommonLib STATIC ${BRAINSCommonLib_SRCS})
target_link_libraries(BRAINSCommonLib ${BRAINSCommonLib_ITK_LIBRARIES} ${ANTS_LIBS} ${double-conversion_LIBRARIES})
set_target_properties(BRAINSCommonLib PROPERTIES FOLDER ${MODULE_FOLDER})

#
# To fix compilation problem: relocation R_X86_64_32 against `a local symbol' can not be
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
set(TestName TestLargestForegroundFilledMaskImageFilter)

add_executable(${TestName} ${TestName}.cxx)
target_link_libraries(${TestName})${BRAINSCommonLib_ITK_LIBRARIES}
target_link_libraries(${TestName} ${BRAINSCommonLib_ITK_LIBRARIES})
set_target_properties(${TestName} PROPERTIES FOLDER ${MODULE_FOLDER})
7 changes: 7 additions & 0 deletions BRAINSCommonLib/TestSuite/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,30 +1,37 @@
add_executable(DumpImageInfo DumpImageInfo.cxx)
target_link_libraries(DumpImageInfo BRAINSCommonLib)
set_target_properties(DumpImageInfo PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testbin)
set_target_properties(DumpImageInfo PROPERTIES FOLDER ${MODULE_FOLDER})

add_executable(PrettyPrintTableTest PrettyPrintTableTest.cxx)
target_link_libraries(PrettyPrintTableTest BRAINSCommonLib)
set_target_properties(PrettyPrintTableTest PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testbin)
set_target_properties(PrettyPrintTableTest PROPERTIES FOLDER ${MODULE_FOLDER})

add_executable( itkResampleInPlaceImageFilterTest itkResampleInPlaceImageFilterTest.cxx)
set_target_properties(itkResampleInPlaceImageFilterTest PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testbin)
target_link_libraries( itkResampleInPlaceImageFilterTest ${BRAINSCommonLib_ITK_LIBRARIES})
set_target_properties(itkResampleInPlaceImageFilterTest PROPERTIES FOLDER ${MODULE_FOLDER})

add_executable(BRAINSCleanMask BRAINSCleanMask.cxx)
target_link_libraries(BRAINSCleanMask ${BRAINSCommonLib_ITK_LIBRARIES})
set_target_properties(BRAINSCleanMask PROPERTIES FOLDER ${MODULE_FOLDER})

add_executable(DWIMetaDataDictionaryValidatorTests DWIMetaDataDictionaryValidatorTests.cxx)
target_link_libraries(DWIMetaDataDictionaryValidatorTests BRAINSCommonLib)
set_target_properties(DWIMetaDataDictionaryValidatorTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testbin)
set_target_properties(DWIMetaDataDictionaryValidatorTests PROPERTIES FOLDER ${MODULE_FOLDER})

add_executable(Slicer3LandmarkIOExceptionTest Slicer3LandmarkIOTest.cxx)
target_link_libraries(Slicer3LandmarkIOExceptionTest BRAINSCommonLib)
set_target_properties(Slicer3LandmarkIOExceptionTest PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testbin)
StandardBRAINSBuildMacro(NAME FindCenterOfBrain TARGET_LIBRARIES BRAINSCommonLib)
set_target_properties(Slicer3LandmarkIOExceptionTest PROPERTIES FOLDER ${MODULE_FOLDER})

add_executable(AverageImageFilterTest AverageImageFilterTest.cxx)
target_link_libraries(AverageImageFilterTest BRAINSCommonLib)
set_target_properties(AverageImageFilterTest PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testbin)
set_target_properties(AverageImageFilterTest PROPERTIES FOLDER ${MODULE_FOLDER})

ExternalData_add_test(FindCenterOfBrainFetchData
NAME AverageImageFilterTest
Expand Down
2 changes: 2 additions & 0 deletions BRAINSConstellationDetector/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ FindVTKUtil(
${LOCAL_VTKQT})
endif()

set(MODULE_FOLDER "Module-BRAINSConstellationDetector")

#-----------------------------------------------------------------------------
# Output directories.
#
Expand Down
3 changes: 3 additions & 0 deletions BRAINSConstellationDetector/TestSuite/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
add_executable(TestlandmarksConstellationTrainingDefinitionIO TestlandmarksConstellationTrainingDefinitionIO.cxx)
target_link_libraries(TestlandmarksConstellationTrainingDefinitionIO BRAINSCommonLib ${BRAINSConstellationDetector_ITK_LIBRARIES}
${VTK_LIBRARIES})
set_target_properties(TestlandmarksConstellationTrainingDefinitionIO PROPERTIES FOLDER ${MODULE_FOLDER})

set(ALL_TEST_PROGS
BRAINSAlignMSP
Expand Down Expand Up @@ -39,6 +40,7 @@ endforeach()
##
# add_executable(BRAINSClipInferiorTest BRAINSClipInferiorTest.cxx)
# target_link_libraries(BRAINSClipInferiorTest BRAINSClipInferiorCOMMONLIB)
# set_target_properties(BRAINSClipInferiorTest PROPERTIES FOLDER ${MODULE_FOLDER})

if( ${BRAINSTools_MAX_TEST_LEVEL} GREATER 8) # This should be restored after fixing.
## Test Versor, This does not currently have a formal test, so disable building it.
Expand All @@ -47,6 +49,7 @@ if( ${BRAINSTools_MAX_TEST_LEVEL} GREATER 8) # This should be restored after fix
set (VersorTester_source VersorTester.cxx)
add_executable(VersorTester ${VersorTester_source})
target_link_libraries(VersorTester ${BRAINSConstellationDetector_ITK_LIBRARIES})
set_target_properties(VersorTester PROPERTIES FOLDER ${MODULE_FOLDER})
endif()

# We want to fetch some data, but we do not want to use them explicity as an argument in
Expand Down
1 change: 1 addition & 0 deletions BRAINSConstellationDetector/gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ add_library( BRAINSConstellationDetectorGUICOMMONLIB STATIC
${BRAINSConstellationDetectorGUI_SRC}
${HEADERS_MOC}
)
set_target_properties(BRAINSConstellationDetectorGUICOMMONLIB PROPERTIES FOLDER ${MODULE_FOLDER})

#
# To fix compilation problem: relocation R_X86_64_32 against `a local symbol' can not be
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ set(PROGS_LIST_1
foreach(prog ${PROGS_LIST_1})
add_executable(${prog} ${prog}.cxx)
target_link_libraries(${prog} BRAINSCommonLib ${BRAINSConstellationDetector_ITK_LIBRARIES} ${VTK_LIBRARIES})
set_target_properties(${prog} PROPERTIES FOLDER ${MODULE_FOLDER})
endforeach()

## Simple CLP programs
Expand Down
2 changes: 1 addition & 1 deletion BRAINSConstellationDetector/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ add_library(landmarksConstellationCOMMONLIB STATIC
BRAINSConstellationDetectorPrimary.cxx)

target_link_libraries(landmarksConstellationCOMMONLIB BRAINSCommonLib ${BRAINSConstellationDetector_ITK_LIBRARIES} ${VTK_LIBRARIES})

set_target_properties(landmarksConstellationCOMMONLIB PROPERTIES FOLDER ${MODULE_FOLDER})

#
# To fix compilation problem: relocation R_X86_64_32 against `a local symbol' can not be
Expand Down
1 change: 1 addition & 0 deletions BRAINSCut/BRAINSCutConfiguration/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ link_libraries( itksys )
##
add_library(NetConfigurationCOMMONLIB STATIC ${NetConfiguration_SRCS})
target_link_libraries(NetConfigurationCOMMONLIB BRAINSCommonLib ${BRAINSCut_ITK_LIBRARIES})
set_target_properties(NetConfigurationCOMMONLIB PROPERTIES FOLDER ${MODULE_FOLDER})

#
# To fix compilation problem: relocation R_X86_64_32 against `a local symbol' can not be
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
##- project(CannyEdge)

set(MODULE_FOLDER "Module-HessianToObjectness")

## Build all the programs
##
add_executable(HessianToObjectness HessianToObjectness.cxx)
target_link_libraries(HessianToObjectness BRAINSCommonLib)
set_target_properties(HessianToObjectness PROPERTIES FOLDER ${MODULE_FOLDER})
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,21 @@ set(ALL_PROGS_LIST
include_directories( ${BRAINSTools_SOURCE_DIR}/BRAINSCut )
include_directories( ${BRAINSTools_SOURCE_DIR}/BRAINSCut/BRAINSCutConfiguration )

set(MODULE_FOLDER "Module-SphericalCoordinateGeneration")

foreach( prog ${ALL_PROGS_LIST} )

GENERATECLP( ${prog}.cxx ${prog}.xml )

# Create the shared library
add_library( ${prog}Lib SHARED ${prog}.cxx )
set_target_properties( ${prog}Lib PROPERTIES COMPILE_FLAGS "-Dmain=ModuleEntryPoint" )
target_link_libraries( ${prog}Lib BRAINSCutCOMMONLIB NetConfigurationCOMMONLIB )
set_target_properties(${prog}Lib PROPERTIES FOLDER ${MODULE_FOLDER})

# Create the executable
add_executable( ${prog} SphericalCoordinateGeneration.cxx )
target_link_libraries( ${prog} BRAINSCutCOMMONLIB NetConfigurationCOMMONLIB )
set_target_properties(${prog} PROPERTIES FOLDER ${MODULE_FOLDER})

endforeach()
5 changes: 5 additions & 0 deletions BRAINSCut/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ message(STATUS "BRAINSCut OpenCV_DIR = ${OpenCV_DIR}")
find_package( OpenCV REQUIRED)
include_directories(${OpenCV_INCLUDE_DIRS})

set(MODULE_FOLDER "Module-BRAINSCut")

###
add_subdirectory(BRAINSFeatureCreators)

Expand Down Expand Up @@ -72,6 +74,8 @@ set(BRAINSCutCOMMONLIB_SRCS
## Build BRAINSCutCOMMONLIB library
##
add_library(BRAINSCutCOMMONLIB STATIC ${BRAINSCutCOMMONLIB_SRCS})
set_target_properties(BRAINSCutCOMMONLIB PROPERTIES FOLDER ${MODULE_FOLDER})

#message(STATUS "${OpenCV_LIBS}") ## Recent versions of OpenCV changed CMake variable name.
#message(STATUS "${OpenCV_LIBRARIES}")
target_link_libraries(BRAINSCutCOMMONLIB
Expand Down Expand Up @@ -106,6 +110,7 @@ endforeach()
add_subdirectory(cnpy) ## https://github.com/rogersce/cnpy Read/write numpy formatted arrays.
add_executable(ImageFeatureExtractor ImageFeatureExtractor.cpp)
target_link_libraries(ImageFeatureExtractor BRAINSCommonLib cnpy)
set_target_properties(ImageFeatureExtractor PROPERTIES FOLDER ${MODULE_FOLDER})

if(1) ## HACK Regina many tests are failing and needs investigation,
## HACK Regina some tests are segmentation faulting
Expand Down
1 change: 1 addition & 0 deletions BRAINSCut/TestSuite/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ set(Reference_BINARY_DIR ${BRAINSTools_BINARY_DIR}/ExternalData)

add_executable(TestHashKey TestHashKey.cxx)
target_link_libraries(TestHashKey BRAINSCutCOMMONLIB)
set_target_properties(TestHashKey PROPERTIES FOLDER ${MODULE_FOLDER})

ExternalData_add_test( ${PROJECT_NAME}FetchData NAME TestHashKeyUnitTests
COMMAND ${LAUNCH_EXE} $<TARGET_FILE:TestHashKey> )
Expand Down
2 changes: 2 additions & 0 deletions BRAINSCut/TestSuite/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ FindITKUtil( BRAINSCut_TestSuite_ITK
# Below Commented out by Regina
#add_executable(testRandomForest testRandomForest.cxx)
#target_link_libraries(testRandomForest ${BRAINSCut_TestSuite_ITK_LIBRARIES} ${OpenCV_LIBRARIES})
#set_target_properties(testRandomForest PROPERTIES FOLDER ${MODULE_FOLDER})
#
#ExternalData_add_test( ${PROJECT_NAME}FetchData NAME OpenCVRandomForestTest
# COMMAND ${LAUNCH_EXE} $<TARGET_FILE:testRandomForest>
Expand All @@ -23,6 +24,7 @@ FindITKUtil( BRAINSCut_TestSuite_ITK

add_executable(compareBinaryTest compareBinaryTest.cxx)
target_link_libraries(compareBinaryTest ${BRAINSCut_TestSuite_ITK_LIBRARIES} ${OPTIONAL_DEBUG_LINK_LIBRARIES})
set_target_properties(compareBinaryTest PROPERTIES FOLDER ${MODULE_FOLDER})

# compare caudate
ExternalData_expand_arguments( ${PROJECT_NAME}FetchData BRAINSCutcaudate_left_scan3_baseline
Expand Down
10 changes: 10 additions & 0 deletions BRAINSCut/cnpy/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,18 @@ option(ENABLE_STATIC "Build static (.a) library" ON)

add_library(cnpy SHARED "cnpy.cpp")
target_link_libraries(cnpy ${ZLIB_LIBRARY})
if(DEFINED MODULE_FOLDER)
set_target_properties(cnpy PROPERTIES FOLDER ${MODULE_FOLDER})
endif()

install(TARGETS "cnpy" LIBRARY DESTINATION lib PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

if(ENABLE_STATIC)
add_library(cnpy-static STATIC "cnpy.cpp")
set_target_properties(cnpy-static PROPERTIES OUTPUT_NAME "cnpy")
if(DEFINED MODULE_FOLDER)
set_target_properties(cnpy PROPERTIES FOLDER ${MODULE_FOLDER})
endif()
install(TARGETS "cnpy-static" ARCHIVE DESTINATION lib)
endif()

Expand All @@ -49,3 +56,6 @@ install(FILES "mat2npz" "npy2mat" "npz2mat" DESTINATION bin PERMISSIONS OWNER_RE

add_executable(example1 example1.cpp)
target_link_libraries(example1 cnpy)
if(DEFINED MODULE_FOLDER)
set_target_properties(cnpy PROPERTIES FOLDER ${MODULE_FOLDER})
endif()
3 changes: 3 additions & 0 deletions BRAINSDemonWarp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ set(BRAINSDemonWarpTemplatesLIB_SRCS
BRAINSDemonWarpTemplates.cxx
)

set(MODULE_FOLDER "Module-BRAINSDemonWarp")

add_library(BRAINSDemonWarpTemplatesLIB STATIC ${BRAINSDemonWarpTemplatesLIB_SRCS})
set_target_properties(BRAINSDemonWarpTemplatesLIB PROPERTIES FOLDER ${MODULE_FOLDER})

set(BRAINSDemonWarpTemplatesLIBLibraries BRAINSCommonLib)
DebugImageViewerLibAdditions(BRAINSDemonWarpTemplatesLIBLibraries)
Expand Down
2 changes: 2 additions & 0 deletions BRAINSFit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ FindITKUtil(BRAINSFit_ITK
# Output directories.
#

set(MODULE_FOLDER "Module-BRAINSFit")

configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/BRAINSFitCommonLib.h.in
${CMAKE_CURRENT_BINARY_DIR}/BRAINSFitCommonLib.h
Expand Down
3 changes: 3 additions & 0 deletions BRAINSFit/TestSuite/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ if(COMPILE_TEST_GENERATION_PROGRAMS) ## These were programs needed to create th
if(MakeMakeXfrmImage)
add_executable(makexfrmedImage makexfrmedImage.cxx)
target_link_libraries(makexfrmedImage ${BRAINSFit_ITK_LIBRARIES})
set_target_properties(makexfrmedImage PROPERTIES FOLDER ${MODULE_FOLDER})
endif()
endif()


# Test the CenterOfROI Test
add_executable(CenterOfROIInitTest CenterOfROIInitTest.cxx )
set_target_properties(CenterOfROIInitTest PROPERTIES FOLDER ${MODULE_FOLDER})

set(CenterOfROIInitTestLibraries BRAINSCommonLib ${BRAINSFit_ITK_LIBRARIES} ${OPTIONAL_DEBUG_LINK_LIBRARIES} )

DebugImageViewerLibAdditions(CenterOfROIInitTestLibraries)
Expand Down
Loading

0 comments on commit a9045b9

Please sign in to comment.