Skip to content

Update cmake script convention #392

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

Merged
merged 2 commits into from
Feb 2, 2021
Merged

Update cmake script convention #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
198d08e
STYLE: Convert CMake-language commands to lower case
jcfr Jan 26, 2021
a60b530
STYLE: Remove CMake-language block-end command arguments
jcfr Jan 26, 2021
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
80 changes: 40 additions & 40 deletions Superbuild/BoostExternal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@
# found at https://github.com/maidsafe/MaidSafe/blob/master/cmake_modules/add_boost.cmake
# and code borrowed from ITK4 HDFMacros.cmake

SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})

# disable auto linking
# also set in Seg3D?
SET(boost_CXX_Flags "-DBOOST_ALL_NO_LIB=1")
IF(APPLE)
LIST(APPEND boost_CXX_Flag "-DBOOST_LCAST_NO_WCHAR_T" "-DBOOST_THREAD_DONT_USE_ATOMIC")
ENDIF()
IF(WIN32)
LIST(APPEND boost_CXX_Flag "-DBOOST_BIND_ENABLE_STDCALL")
ENDIF()
set(boost_CXX_Flags "-DBOOST_ALL_NO_LIB=1")
if(APPLE)
list(APPEND boost_CXX_Flag "-DBOOST_LCAST_NO_WCHAR_T" "-DBOOST_THREAD_DONT_USE_ATOMIC")
endif()
if(WIN32)
list(APPEND boost_CXX_Flag "-DBOOST_BIND_ENABLE_STDCALL")
endif()

SET( boost_DEPENDENCIES )
set( boost_DEPENDENCIES )

# explicitly set library list
SET(boost_Libraries
set(boost_Libraries
"atomic"
"date_time"
"exception"
Expand All @@ -53,27 +53,27 @@ SET(boost_Libraries
"thread"
CACHE INTERNAL "Boost library name.")

IF(BUILD_WITH_PYTHON)
ADD_DEFINITIONS(-DBOOST_PYTHON_STATIC_LIB=1)
LIST(APPEND boost_Libraries python)
LIST(APPEND boost_DEPENDENCIES Python_external)
LIST(APPEND boost_CXX_Flag "-DBOOST_PYTHON_STATIC_MODULE" "-DBOOST_PYTHON_STATIC_LIB")
ENDIF()
if(BUILD_WITH_PYTHON)
add_definitions(-DBOOST_PYTHON_STATIC_LIB=1)
list(APPEND boost_Libraries python)
list(APPEND boost_DEPENDENCIES Python_external)
list(APPEND boost_CXX_Flag "-DBOOST_PYTHON_STATIC_MODULE" "-DBOOST_PYTHON_STATIC_LIB")
endif()

# TODO: set up 64-bit build detection
# Boost Jam needs to have 64-bit build explicitly configured
IF(WIN32)
SET(FORCE_64BIT_BUILD ON)
SET(boost_GIT_TAG "origin/v1.67.0")
ELSE()
SET(boost_GIT_TAG "origin/v1.58.0")
ENDIF()
if(WIN32)
set(FORCE_64BIT_BUILD ON)
set(boost_GIT_TAG "origin/v1.67.0")
else()
set(boost_GIT_TAG "origin/v1.58.0")
endif()

SET(boost_GIT_URL "https://github.com/CIBC-Internal/boost.git")
set(boost_GIT_URL "https://github.com/CIBC-Internal/boost.git")

IF(TRAVIS_BUILD)
LIST(APPEND boost_CXX_Flag "-w")
ENDIF()
if(TRAVIS_BUILD)
list(APPEND boost_CXX_Flag "-w")
endif()

# TODO: fix install step
#
Expand All @@ -99,24 +99,24 @@ ExternalProject_Add(Boost_external

ExternalProject_Get_Property(Boost_external INSTALL_DIR)
ExternalProject_Get_Property(Boost_external SOURCE_DIR)
SET(SCI_BOOST_INCLUDE ${SOURCE_DIR})
SET(SCI_BOOST_LIBRARY_DIR ${SOURCE_DIR}/lib)
SET(SCI_BOOST_USE_FILE ${INSTALL_DIR}/UseBoost.cmake)
set(SCI_BOOST_INCLUDE ${SOURCE_DIR})
set(SCI_BOOST_LIBRARY_DIR ${SOURCE_DIR}/lib)
set(SCI_BOOST_USE_FILE ${INSTALL_DIR}/UseBoost.cmake)

SET(BOOST_PREFIX "boost_")
SET(THREAD_POSTFIX "-mt")
set(BOOST_PREFIX "boost_")
set(THREAD_POSTFIX "-mt")

SET(SCI_BOOST_LIBRARY)
set(SCI_BOOST_LIBRARY)

FOREACH(lib ${boost_Libraries})
SET(LIB_NAME "${BOOST_PREFIX}${lib}${THREAD_POSTFIX}")
LIST(APPEND SCI_BOOST_LIBRARY ${LIB_NAME})
ENDFOREACH()
foreach(lib ${boost_Libraries})
set(LIB_NAME "${BOOST_PREFIX}${lib}${THREAD_POSTFIX}")
list(APPEND SCI_BOOST_LIBRARY ${LIB_NAME})
endforeach()

# Boost is special case - normally this should be handled in external library repo
CONFIGURE_FILE(${SUPERBUILD_DIR}/BoostConfig.cmake.in ${INSTALL_DIR}/BoostConfig.cmake @ONLY)
CONFIGURE_FILE(${SUPERBUILD_DIR}/UseBoost.cmake ${SCI_BOOST_USE_FILE} COPYONLY)
configure_file(${SUPERBUILD_DIR}/BoostConfig.cmake.in ${INSTALL_DIR}/BoostConfig.cmake @ONLY)
configure_file(${SUPERBUILD_DIR}/UseBoost.cmake ${SCI_BOOST_USE_FILE} COPYONLY)

SET(Boost_DIR ${INSTALL_DIR} CACHE PATH "")
set(Boost_DIR ${INSTALL_DIR} CACHE PATH "")

MESSAGE(STATUS "Boost_DIR: ${Boost_DIR}")
message(STATUS "Boost_DIR: ${Boost_DIR}")
22 changes: 11 additions & 11 deletions Superbuild/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9 FATAL_ERROR)
#CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
#CMAKE_MINIMUM_REQUIRED(VERSION 3.0 FATAL_ERROR)
IF(POLICY CMP0053)
CMAKE_POLICY(SET CMP0053 OLD)
ENDIF()
IF(POLICY CMP0054)
CMAKE_POLICY(SET CMP0054 NEW)
ENDIF()
cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
#cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
#cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD)
endif()
if(POLICY CMP0054)
cmake_policy(SET CMP0054 NEW)
endif()


PROJECT(Superbuild)
project(Superbuild)

INCLUDE(${CMAKE_SOURCE_DIR}/Superbuild.cmake)
include(${CMAKE_SOURCE_DIR}/Superbuild.cmake)
12 changes: 6 additions & 6 deletions Superbuild/DataExternal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.

SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})

SET(data_GIT_URL "https://github.com/CIBC-Internal/Seg3DData.git")
set(data_GIT_URL "https://github.com/CIBC-Internal/Seg3DData.git")
# master should be always be publicly released version
SET(data_GIT_TAG "origin/master")
set(data_GIT_TAG "origin/master")

SET(data_DIR "${SEG3D_BINARY_DIR}/Seg3DData")
set(data_DIR "${SEG3D_BINARY_DIR}/Seg3DData")

# If CMake ever allows overriding the checkout command or adding flags,
# git checkout -q will silence message about detached head (harmless).
Expand All @@ -45,6 +45,6 @@ ExternalProject_Add(Data_external
)

# test data location for tests
SET(TEST_INPUT_PATH ${data_DIR} CACHE PATH "Root for all github-based data files")
set(TEST_INPUT_PATH ${data_DIR} CACHE PATH "Root for all github-based data files")

MESSAGE(STATUS "TEST_INPUT_PATH: ${TEST_INPUT_PATH}")
message(STATUS "TEST_INPUT_PATH: ${TEST_INPUT_PATH}")
6 changes: 3 additions & 3 deletions Superbuild/EigenExternal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.

SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})

# TODO: test on Windows
ExternalProject_Add(Eigen_external
Expand All @@ -37,6 +37,6 @@ ExternalProject_Add(Eigen_external
)

ExternalProject_Get_Property(Eigen_external SOURCE_DIR)
SET(Eigen_DIR ${SOURCE_DIR} CACHE PATH "")
set(Eigen_DIR ${SOURCE_DIR} CACHE PATH "")

MESSAGE(STATUS "Eigen_DIR: ${Eigen_DIR}")
message(STATUS "Eigen_DIR: ${Eigen_DIR}")
16 changes: 8 additions & 8 deletions Superbuild/FreetypeExternal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.

SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
SET(freetype_GIT_TAG "origin/master")
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
set(freetype_GIT_TAG "origin/master")

IF(TRAVIS_BUILD)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
ENDIF()
if(TRAVIS_BUILD)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
endif()

# If CMake ever allows overriding the checkout command or adding flags,
# git checkout -q will silence message about detached head (harmless).
Expand All @@ -49,6 +49,6 @@ ExternalProject_Add(Freetype_external
)

ExternalProject_Get_Property(Freetype_external BINARY_DIR)
SET(Freetype_DIR ${BINARY_DIR} CACHE PATH "")
set(Freetype_DIR ${BINARY_DIR} CACHE PATH "")

MESSAGE(STATUS "Freetype_DIR: ${Freetype_DIR}")
message(STATUS "Freetype_DIR: ${Freetype_DIR}")
16 changes: 8 additions & 8 deletions Superbuild/GlewExternal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.

SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
SET(glew_GIT_TAG "origin/master")
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
set(glew_GIT_TAG "origin/master")

IF(TRAVIS_BUILD)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
ENDIF()
if(TRAVIS_BUILD)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
endif()

# If CMake ever allows overriding the checkout command or adding flags,
# git checkout -q will silence message about detached head (harmless).
Expand All @@ -49,6 +49,6 @@ ExternalProject_Add(Glew_external
)

ExternalProject_Get_Property(Glew_external BINARY_DIR)
SET(Glew_DIR ${BINARY_DIR} CACHE PATH "")
set(Glew_DIR ${BINARY_DIR} CACHE PATH "")

MESSAGE(STATUS "Glew_DIR: ${Glew_DIR}")
message(STATUS "Glew_DIR: ${Glew_DIR}")
28 changes: 14 additions & 14 deletions Superbuild/ITKExternal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.

SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})

SET(itk_ARGS
set(itk_ARGS
"-DBUILD_SHARED_LIBS:BOOL=OFF"
"-DITK_BUILD_SHARED_LIBS:BOOL=OFF"
"-DBUILD_EXAMPLES:BOOL=OFF"
Expand All @@ -35,17 +35,17 @@ SET(itk_ARGS
"-DITK_INSTALL_NO_DEVELOPMENT:BOOL=OFF"
)

IF(TRAVIS_BUILD)
LIST(APPEND itk_ARGS
if(TRAVIS_BUILD)
list(APPEND itk_ARGS
"-Wno-dev"
"-Wno-deprecated"
)

SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
ENDIF()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
endif()

SET(itk_CACHE_ARGS
set(itk_CACHE_ARGS
"-DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}"
"-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}"
"-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>"
Expand Down Expand Up @@ -78,17 +78,17 @@ SET(itk_CACHE_ARGS
"-DCMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY:STATIC=${CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY}"
)

IF(BUILD_MOSAIC_TOOLS)
LIST(APPEND itk_CACHE_ARGS
if(BUILD_MOSAIC_TOOLS)
list(APPEND itk_CACHE_ARGS
"-DITK_USE_FFTWD:BOOL=ON"
"-DITK_USE_FFTWF:BOOL=ON"
"-DModule_ITKImageIntensity:BOOL=ON"
"-DModule_ITKThresholding:BOOL=ON"
"-DModule_ITKTransformFactory:BOOL=ON"
)
ENDIF()
endif()

SET(itk_GIT_TAG "v5.1.2")
set(itk_GIT_TAG "v5.1.2")

# If CMake ever allows overriding the checkout command or adding flags,
# git checkout -q will silence message about detached head (harmless).
Expand All @@ -103,6 +103,6 @@ ExternalProject_Add(ITK_external

# hardcoded, since we need this before ITK's configure step
ExternalProject_Get_Property(ITK_external INSTALL_DIR)
SET(ITK_DIR "${INSTALL_DIR}/lib/cmake/ITK-5.1" CACHE PATH "")
set(ITK_DIR "${INSTALL_DIR}/lib/cmake/ITK-5.1" CACHE PATH "")

MESSAGE(STATUS "ITK_DIR=${ITK_DIR}")
message(STATUS "ITK_DIR=${ITK_DIR}")
16 changes: 8 additions & 8 deletions Superbuild/ImplicitFunctionExternal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.

SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
SET(implicitFunction_GIT_TAG "origin/master")
SET(implicitFunction_DEPENDENCIES "Tetgen_external;Eigen_external")
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
set(implicitFunction_GIT_TAG "origin/master")
set(implicitFunction_DEPENDENCIES "Tetgen_external;Eigen_external")

IF(TRAVIS_BUILD)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
ENDIF()
if(TRAVIS_BUILD)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
endif()

# If CMake ever allows overriding the checkout command or adding flags,
# git checkout -q will silence message about detached head (harmless).
Expand All @@ -57,6 +57,6 @@ ExternalProject_Add(ImplicitFunction_external
)

ExternalProject_Get_Property(ImplicitFunction_external BINARY_DIR)
SET(ImplicitFunction_DIR ${BINARY_DIR} CACHE PATH "")
set(ImplicitFunction_DIR ${BINARY_DIR} CACHE PATH "")

MESSAGE(STATUS "ImplicitFunction_DIR: ${ImplicitFunction_DIR}")
message(STATUS "ImplicitFunction_DIR: ${ImplicitFunction_DIR}")
18 changes: 9 additions & 9 deletions Superbuild/LibPNGExternal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.

SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
SET(libpng_GIT_TAG "origin/master")
SET(libpng_DEPENDENCIES "Zlib_external")
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
set(libpng_GIT_TAG "origin/master")
set(libpng_DEPENDENCIES "Zlib_external")

IF(TRAVIS_BUILD)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
ENDIF()
if(TRAVIS_BUILD)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
endif()

# If CMake ever allows overriding the checkout command or adding flags,
# git checkout -q will silence message about detached head (harmless).
Expand All @@ -54,6 +54,6 @@ ExternalProject_Add(LibPNG_external
)

ExternalProject_Get_Property(LibPNG_external BINARY_DIR)
SET(LibPNG_DIR ${BINARY_DIR} CACHE PATH "")
set(LibPNG_DIR ${BINARY_DIR} CACHE PATH "")

MESSAGE(STATUS "LibPNG_DIR: ${LibPNG_DIR}")
message(STATUS "LibPNG_DIR: ${LibPNG_DIR}")
Loading