Change cmake style

Author: FilipeMaia

CMakeLists.txt

@@ -1,3 +1,4 @@
+
 cmake_minimum_required(VERSION 3.18)
 
 if(POLICY CMP0042)
@@ -8,43 +9,43 @@ if(POLICY CMP0025)
   cmake_policy(SET CMP0025 NEW) # CMake 3.0
 endif()
 
-PROJECT (spimage)
+project(spimage)
 
-INCLUDE(CTest)
-ENABLE_TESTING()
-IF(BUILD_TESTING)
-  SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
-  MARK_AS_ADVANCED(BUILDNAME)
-ENDIF(BUILD_TESTING)
+include(CTest)
+enable_testing()
+if(BUILD_TESTING)
+  set(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
+  mark_as_advanced(BUILDNAME)
+endif()
 
 
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 # Make sure that while building this library the include files are not 
 # built with export prefix
-ADD_DEFINITIONS(-D SPIMAGE_NO_DLL)
+add_definitions(-D SPIMAGE_NO_DLL)
 
-IF(WIN32)
-#	ADD_DEFINITIONS(-D_HDF5USEDLL_)
-ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
+if(WIN32)
+#   add_definitions(-D_HDF5USEDLL_)
+add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
 # Required for compilign with MSVC as documented in
 # USING_HDF5_VS.txt from the hdf group
 add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
-ENDIF(WIN32)
+endif()
 
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=c99")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
+if(CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=c99")
+endif()
 
-	
+  
 
-SET(BUILD_STATIC_LIB CACHE BOOL "If ON output static library. Otherwise output shared libraries.")
-SET(INCLUDE_DEPENDENCIES CACHE BOOL "[EXPERIMENTAL] If ON embed dependent libraries.")
-SET(DMALLOC_USE OFF CACHE BOOL "If ON link to dmalloc library if possible.")
-SET(DOUBLE_PRECISION OFF CACHE BOOL "If ON use double precision. Otherwise use single precision")
-SET(SP_MEM_DEBUG OFF CACHE BOOL "If ON use memory debugging code.")
-SET(USE_CUDA ON CACHE BOOL "If ON try to use CUDA.")
-SET(PYTHON_WRAPPERS ON CACHE BOOL "If ON try to build python wrappers.")
+set(BUILD_STATIC_LIB CACHE BOOL "If ON output static library. Otherwise output shared libraries.")
+set(INCLUDE_DEPENDENCIES CACHE BOOL "[EXPERIMENTAL] If ON embed dependent libraries.")
+set(DMALLOC_USE OFF CACHE BOOL "If ON link to dmalloc library if possible.")
+set(DOUBLE_PRECISION OFF CACHE BOOL "If ON use double precision. Otherwise use single precision")
+set(SP_MEM_DEBUG OFF CACHE BOOL "If ON use memory debugging code.")
+set(USE_CUDA ON CACHE BOOL "If ON try to use CUDA.")
+set(PYTHON_WRAPPERS ON CACHE BOOL "If ON try to build python wrappers.")
 
 find_package(TIFF)
 find_package(FFTW3 REQUIRED)
@@ -68,20 +69,20 @@ if(PYTHON_WRAPPERS)
   endif()
   find_package(SWIG)
   if(PYTHON_LIBRARIES AND SWIG_FOUND AND PYTHON_EXECUTABLE AND PYTHON_NUMPY_FOUND)
-    SET(PYTHON_INSTDIR ${Python3_SITELIB} CACHE PATH "Installation directory for python module.")
+    set(PYTHON_INSTDIR ${Python3_SITELIB} CACHE PATH "Installation directory for python module.")
     mark_as_advanced(PYTHON_INSTDIR)
   endif()
-endif(PYTHON_WRAPPERS)
-IF(USE_CUDA)
+endif()
+if(USE_CUDA)
   find_package(CUDAToolkit)
-  IF(CUDAToolkit_BIN_DIR)
-    SET(CUDA_FOUND TRUE)
-  ELSE(CUDAToolkit_BIN_DIR)
-    SET(CUDA_FOUND FALSE)
-  ENDIF(CUDAToolkit_BIN_DIR)
-  IF(CUDA_FOUND)
+  if(CUDAToolkit_BIN_DIR)
+    set(CUDA_FOUND TRUE)
+  else()
+    set(CUDA_FOUND FALSE)
+  endif()
+  if(CUDA_FOUND)
     enable_language(CUDA)
-    ADD_DEFINITIONS(-D_USE_CUDA)
+    add_definitions(-D_USE_CUDA)
     # Set a reasonable minimum arch
     if(CUDAToolkit_VERSION_MAJOR GREATER 11)
       set(CMAKE_CUDA_ARCHITECTURES "50" CACHE STRING "CUDA architectures to build for")
@@ -91,95 +92,95 @@ IF(USE_CUDA)
       set(CMAKE_CUDA_ARCHITECTURES "30" CACHE STRING "CUDA architectures to build for")
     endif()
     message(STATUS "CUDA found. Using CUDA.")
-  ELSE(CUDA_FOUND)
+  else(CUDA_FOUND)
     message(STATUS "CUDA not found. Not using CUDA.")
-  ENDIF(CUDA_FOUND)
-ELSE(USE_CUDA)
-  UNSET(CUDA_FOUND)
-ENDIF(USE_CUDA)
+  endif(CUDA_FOUND)
+else(USE_CUDA)
+  unset(CUDA_FOUND)
+endif(USE_CUDA)
 
 #   Offer the user the choice of overriding the installation directories
-INCLUDE(GNUInstallDirs)
-IF(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-  SET(CMAKE_INSTALL_LIBDIR lib)
-ENDIF(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-
-IF(DOUBLE_PRECISION)
-	ADD_DEFINITIONS(-D_SP_DOUBLE_PRECISION)
-ELSE(DOUBLE_PRECISION)	
-	ADD_DEFINITIONS(-D_SP_SINGLE_PRECISION)
-ENDIF(DOUBLE_PRECISION)
-
-IF(SP_MEM_DEBUG)
-	ADD_DEFINITIONS(-D_SP_MEM_DEBUG)
-ENDIF(SP_MEM_DEBUG)
-	
-
-IF(DMALLOC_USE)
-  FIND_LIBRARY (DMALLOC_LIBRARY dmalloc /usr/lib /sw/lib)
-  FIND_PATH (DMALLOC_INCLUDE_DIR dmalloc.h PATHS /usr/include /sw/include)	
-  IF(DMALLOC_LIBRARY)
-    ADD_DEFINITIONS(-D_USE_DMALLOC)
-    SET(LINK_TO_DMALLOC 1)
-  ENDIF(DMALLOC_LIBRARY)
-ENDIF(DMALLOC_USE)
+include(GNUInstallDirs)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+  set(CMAKE_INSTALL_LIBDIR lib)
+endif()
+
+if(DOUBLE_PRECISION)
+  add_definitions(-D_SP_DOUBLE_PRECISION)
+else(DOUBLE_PRECISION)
+  add_definitions(-D_SP_SINGLE_PRECISION)
+endif(DOUBLE_PRECISION)
+
+if(SP_MEM_DEBUG)
+  add_definitions(-D_SP_MEM_DEBUG)
+endif(SP_MEM_DEBUG)
+
+if(DMALLOC_USE)
+  find_library(DMALLOC_LIBRARY dmalloc /usr/lib /sw/lib)
+  find_path(DMALLOC_INCLUDE_DIR dmalloc.h PATHS /usr/include /sw/include)
+  if(DMALLOC_LIBRARY)
+    add_definitions(-D_USE_DMALLOC)
+    set(LINK_TO_DMALLOC 1)
+  endif(DMALLOC_LIBRARY)
+endif(DMALLOC_USE)
 
 
 # when building, don't use the install RPATH already
 # (but later on when installing)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
 
-IF(APPLE)
+if(APPLE)
   # There's a problem with install_name_tool which cannot
   # handle duplicate rpaths, so we'll take the calculated risk
   # of not including rpaths in the build on macosx
-  SET(CMAKE_SKIP_BUILD_RPATH  TRUE)
-ELSE(APPLE)
-  SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
-ENDIF(APPLE)
+  set(CMAKE_SKIP_BUILD_RPATH  TRUE)
+else(APPLE)
+  set(CMAKE_SKIP_BUILD_RPATH  FALSE)
+endif(APPLE)
 
 # add the automatically determined parts of the RPATH
 # which point to directories outside the build tree to the install RPATH
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 # the RPATH to be used when installing, but only if it's not a system directory
-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${CMAKE_INSTALL_LIBDIR} isSystemDir)
-IF("${isSystemDir}" STREQUAL "-1")
-  SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR})
-ENDIF("${isSystemDir}" STREQUAL "-1")
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${CMAKE_INSTALL_LIBDIR} isSystemDir)
+if("${isSystemDir}" STREQUAL "-1")
+  set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR})
+endif("${isSystemDir}" STREQUAL "-1")
 
 
 configure_file(${PROJECT_SOURCE_DIR}/include/config.h.in 
   ${PROJECT_BINARY_DIR}/config.h)
 include_directories("${PROJECT_BINARY_DIR}")
 
 
-INCLUDE_DIRECTORIES(${FFTW3_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR} ${HDF5_INCLUDE_DIR} ${GSL_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(BEFORE "${CMAKE_SOURCE_DIR}/include/")
-IF(CUDA_FOUND)
-INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS})
-ENDIF(CUDA_FOUND)
-
-LIST(APPEND TESTS_LIBRARIES  ${TIFF_LIBRARIES} ${FFTW3_LIBRARIES} ${PNG_LIBRARIES} ${HDF5_LIBRARIES}  ${GSL_LIBRARIES})
-LIST(APPEND SPIMAGE_LIBRARIES  ${TIFF_LIBRARIES} ${FFTW3_LIBRARIES} ${PNG_LIBRARIES} ${HDF5_LIBRARIES})
-	    
-IF(LINK_TO_DMALLOC)
-LIST(APPEND SPIMAGE_LIBRARIES ${DMALLOC_LIBRARY})
-LIST(APPEND TESTS_LIBRARIES ${DMALLOC_LIBRARY})
-ENDIF(LINK_TO_DMALLOC)
-
-LIST(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/image_util.c" "${CMAKE_SOURCE_DIR}/src/fft.c" "${CMAKE_SOURCE_DIR}/src/linear_alg.c")
-LIST(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/mem_util.c" "${CMAKE_SOURCE_DIR}/src/image_sphere.c" "${CMAKE_SOURCE_DIR}/src/sperror.c")
-LIST(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/gaussianinv.c" "${CMAKE_SOURCE_DIR}/src/image_noise.c" "${CMAKE_SOURCE_DIR}/src/hashtable.c")
-LIST(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/interpolation_kernels.c" "${CMAKE_SOURCE_DIR}/src/time_util.c")
-LIST(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/list.c" "${CMAKE_SOURCE_DIR}/src/prtf.c" "${CMAKE_SOURCE_DIR}/src/phasing.c")
-LIST(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/colormap.c" "${CMAKE_SOURCE_DIR}/src/cuda_util.c" "${CMAKE_SOURCE_DIR}/src/support_update.c")
-LIST(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/image_io.c" "${CMAKE_SOURCE_DIR}/src/image_filter.c")
-LIST(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/find_center.c")
-
-ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(include)
+include_directories(${FFTW3_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR} ${HDF5_INCLUDE_DIR} ${GSL_INCLUDE_DIR})
+include_directories(BEFORE "${CMAKE_SOURCE_DIR}/include/")
+if(CUDA_FOUND)
+include_directories(${CUDA_INCLUDE_DIRS})
+endif()
+
+
+list(APPEND TESTS_LIBRARIES  ${TIFF_LIBRARIES} ${FFTW3_LIBRARIES} ${PNG_LIBRARIES} ${HDF5_LIBRARIES}  ${GSL_LIBRARIES})
+list(APPEND SPIMAGE_LIBRARIES  ${TIFF_LIBRARIES} ${FFTW3_LIBRARIES} ${PNG_LIBRARIES} ${HDF5_LIBRARIES})
+    
+if(LINK_TO_DMALLOC)
+list(APPEND SPIMAGE_LIBRARIES ${DMALLOC_LIBRARY})
+list(APPEND TESTS_LIBRARIES ${DMALLOC_LIBRARY})
+endif()
+
+list(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/image_util.c" "${CMAKE_SOURCE_DIR}/src/fft.c" "${CMAKE_SOURCE_DIR}/src/linear_alg.c")
+list(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/mem_util.c" "${CMAKE_SOURCE_DIR}/src/image_sphere.c" "${CMAKE_SOURCE_DIR}/src/sperror.c")
+list(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/gaussianinv.c" "${CMAKE_SOURCE_DIR}/src/image_noise.c" "${CMAKE_SOURCE_DIR}/src/hashtable.c")
+list(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/interpolation_kernels.c" "${CMAKE_SOURCE_DIR}/src/time_util.c")
+list(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/list.c" "${CMAKE_SOURCE_DIR}/src/prtf.c" "${CMAKE_SOURCE_DIR}/src/phasing.c")
+list(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/colormap.c" "${CMAKE_SOURCE_DIR}/src/cuda_util.c" "${CMAKE_SOURCE_DIR}/src/support_update.c")
+list(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/image_io.c" "${CMAKE_SOURCE_DIR}/src/image_filter.c")
+list(APPEND SPIMAGE_SRC "${CMAKE_SOURCE_DIR}/src/find_center.c")
+
+add_subdirectory(src)
+add_subdirectory(include)
 
 if(GSL_FOUND)
-ADD_SUBDIRECTORY(tests)
+add_subdirectory(tests)
 endif()

src/CMakeLists.txt

@@ -1,22 +1,22 @@
-LIST(APPEND OBJECTS ${SPIMAGE_SRC})
+list(APPEND OBJECTS ${SPIMAGE_SRC})
 
 
 
-IF(CUDA_FOUND)
-  LIST(APPEND OBJECTS "fft.cu" "phasing.cu" "phasing_kernels.cu" "support_update_cuda.cu" "image_filter_cuda.cu")
-ENDIF(CUDA_FOUND)
+if(CUDA_FOUND)
+  list(APPEND OBJECTS "fft.cu" "phasing.cu" "phasing_kernels.cu" "support_update_cuda.cu" "image_filter_cuda.cu")
+endif()
 
-IF(BUILD_STATIC_LIB)
-	ADD_LIBRARY(spimage STATIC ${OBJECTS})
-ELSE(BUILD_STATIC_LIB)
-ADD_LIBRARY(spimage SHARED ${OBJECTS})
-IF(CUDA_FOUND)
-  LIST(APPEND SPIMAGE_LIBRARIES CUDA::curand CUDA::cufft)
+if(BUILD_STATIC_LIB)
+  add_library(spimage STATIC ${OBJECTS})
+else()
+add_library(spimage SHARED ${OBJECTS})
+if(CUDA_FOUND)
+  list(APPEND SPIMAGE_LIBRARIES CUDA::curand CUDA::cufft)
   #set_target_properties(spimage PROPERTIES CUDA_ARCHITECTURES "35")
-ENDIF(CUDA_FOUND)
-ENDIF(BUILD_STATIC_LIB)
+endif()
+endif()
 
-TARGET_LINK_LIBRARIES(spimage PRIVATE ${SPIMAGE_LIBRARIES})
+target_link_libraries(spimage PRIVATE ${SPIMAGE_LIBRARIES})
 
 set_target_properties(
  spimage
@@ -32,26 +32,26 @@ if(WIN32)
     PROPERTIES
     WINDOWS_EXPORT_ALL_SYMBOLS ON
     )
-endif(WIN32)
+endif()
 
 
-INSTALL(TARGETS spimage
+install(TARGETS spimage
   RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 if(SWIG_FOUND AND Python3_Interpreter_FOUND AND PYTHON_NUMPY_FOUND)
-  FILE(GLOB spimage_headers "${CMAKE_CURRENT_SOURCE_DIR}/../include/spimage/*.h")
+  file(GLOB spimage_headers "${CMAKE_CURRENT_SOURCE_DIR}/../include/spimage/*.h")
 
   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/spimage_wrap.c COMMAND ${SWIG_EXECUTABLE} -python -outcurrentdir  -o ${CMAKE_CURRENT_BINARY_DIR}/spimage_wrap.c ${CMAKE_CURRENT_SOURCE_DIR}/spimage_pybackend.i DEPENDS ${spimage_headers} ${CMAKE_CURRENT_SOURCE_DIR}/spimage_pybackend.i)
-  INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} ${PYTHON_NUMPY_INCLUDE_DIR})
+  include_directories(${PYTHON_INCLUDE_PATH} ${PYTHON_NUMPY_INCLUDE_DIR})
 
-  ADD_LIBRARY(_spimage_pybackend SHARED ${OBJECTS} ${CMAKE_CURRENT_BINARY_DIR}/spimage_wrap.c)
+  add_library(_spimage_pybackend SHARED ${OBJECTS} ${CMAKE_CURRENT_BINARY_DIR}/spimage_wrap.c)
 
   if(APPLE)
-    TARGET_LINK_LIBRARIES(_spimage_pybackend ${SPIMAGE_LIBRARIES} "-undefined dynamic_lookup")
-  else(APPLE)
-    TARGET_LINK_LIBRARIES(_spimage_pybackend ${SPIMAGE_LIBRARIES} ${PYTHON_LIBRARIES})
+    target_link_libraries(_spimage_pybackend ${SPIMAGE_LIBRARIES} "-undefined dynamic_lookup")
+  else()
+    target_link_libraries(_spimage_pybackend ${SPIMAGE_LIBRARIES} ${PYTHON_LIBRARIES})
   endif()
 
   set_target_properties(
@@ -68,20 +68,20 @@ if(SWIG_FOUND AND Python3_Interpreter_FOUND AND PYTHON_NUMPY_FOUND)
       PROPERTIES
       SUFFIX ".pyd"
       )
-  else(WIN32)
+  else()
     set_target_properties(
       _spimage_pybackend
       PROPERTIES
       SUFFIX ".so"
       )
   endif()
 
-  INSTALL(TARGETS _spimage_pybackend
+  install(TARGETS _spimage_pybackend
     RUNTIME DESTINATION ${PYTHON_INSTDIR}
     LIBRARY DESTINATION ${PYTHON_INSTDIR}
     ARCHIVE DESTINATION ${PYTHON_INSTDIR}
     )
-  INSTALL(FILES spimage.py ${CMAKE_CURRENT_BINARY_DIR}/spimage_pybackend.py _spimage_conventions.py _spimage_cxi.py _spimage_resample.py _spimage_reconstructor.py _spimage_prtf.py _spimage_io.py _spimage_find_center.py _spimage_sphere_model.py _spimage_spheroid_model.py _spimage_pixelmask.py _spimage_qmap.py _spimage_utils.py _spimage_misc.py _spimage_patterson.py _spimage_material.py elements.dat leastsqbound-scipy/leastsqbound.py DESTINATION  ${PYTHON_INSTDIR})
-else(SWIG_FOUND AND Python3_Interpreter_FOUND AND PYTHON_NUMPY_FOUND)
-  MESSAGE("Skipping python wrappers: SWIG_FOUND=${SWIG_FOUND} Python3_Interpreter_FOUND=${Python3_Interpreter_FOUND} PYTHON_NUMPY_FOUND=${PYTHON_NUMPY_FOUND}")
+  install(FILES spimage.py ${CMAKE_CURRENT_BINARY_DIR}/spimage_pybackend.py _spimage_conventions.py _spimage_cxi.py _spimage_resample.py _spimage_reconstructor.py _spimage_prtf.py _spimage_io.py _spimage_find_center.py _spimage_sphere_model.py _spimage_spheroid_model.py _spimage_pixelmask.py _spimage_qmap.py _spimage_utils.py _spimage_misc.py _spimage_patterson.py _spimage_material.py elements.dat leastsqbound-scipy/leastsqbound.py DESTINATION  ${PYTHON_INSTDIR})
+else()
+  message("Skipping python wrappers: SWIG_FOUND=${SWIG_FOUND} Python3_Interpreter_FOUND=${Python3_Interpreter_FOUND} PYTHON_NUMPY_FOUND=${PYTHON_NUMPY_FOUND}")
 endif()