COMP: Link against elastix transformix

OpenMP symbols are not pimpled.
SuperElastix · May 1, 2017 · aae32c3 · aae32c3
1 parent 9a0d5e9
commit aae32c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -166,7 +166,7 @@ set ( SimpleITK_INCLUDE_DIRS
       ${CMAKE_BINARY_DIR}/Code/Common/include
       )
 
-set ( SimpleITK_LIBRARIES SimpleITKCommon SimpleITKIO SimpleITKRegistration ElastixImageFilter TransformixImageFilter )
+set ( SimpleITK_LIBRARIES SimpleITKCommon SimpleITKIO SimpleITKRegistration ElastixImageFilter TransformixImageFilter elastix transformix )
 
 if (SimpleITK_EXPLICIT_INSTANTIATION)
   list ( APPEND SimpleITK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/Code/Explicit/include )

diff --git a/SuperBuild/External_Elastix.cmake b/SuperBuild/External_Elastix.cmake
@@ -1,11 +1,5 @@
 set( proj elastix )
 
-if( ${BUILD_SHARED_LIBS} )
-  set( ELASTIX_BUILD_SHARED_LIBS ON )
-else()
-  set( ELASTIX_BUILD_SHARED_LIBS OFF )
-endif()
-
 file( WRITE "${CMAKE_CURRENT_BINARY_DIR}/${proj}-build/CMakeCacheInit.txt" "${ep_common_cache}" )
 
 set( ELASTIX_GIT_REPOSITORY ${git_protocol}://github.com/mstaring/elastix )
@@ -24,8 +18,8 @@ ExternalProject_Add( ${proj}
   ${ep_common_args}
   -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
   -DBUILD_TESTING:BOOL=OFF
+  -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
   -DELASTIX_BUILD_EXECUTABLE:BOOL=OFF
-  -DBUILD_SHARED_LIBS:BOOL=${ELASTIX_BUILD_SHARED_LIBS}
   -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   -DITK_DIR:PATH=${ITK_DIR}
   -DELASTIX_IMAGE_2D_PIXELTYPES:STRING=float