Skip to content

Commit fed6cff

Browse files
allywarnerallywarner
authored
Merge pull request #392 from jcfr/update-cmake-script-convention
Update cmake script convention
2 parents c0369d7 + a60b530 commit fed6cff

File tree

100 files changed

+1384
-1384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1384
-1384
lines changed

‎Superbuild/BoostExternal.cmake‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@
2828
# found at https://github.com/maidsafe/MaidSafe/blob/master/cmake_modules/add_boost.cmake
2929
# and code borrowed from ITK4 HDFMacros.cmake
3030

31-
SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
31+
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
3232

3333
# disable auto linking
3434
# also set in Seg3D?
35-
SET(boost_CXX_Flags "-DBOOST_ALL_NO_LIB=1")
36-
IF(APPLE)
37-
LIST(APPEND boost_CXX_Flag "-DBOOST_LCAST_NO_WCHAR_T" "-DBOOST_THREAD_DONT_USE_ATOMIC")
38-
ENDIF()
39-
IF(WIN32)
40-
LIST(APPEND boost_CXX_Flag "-DBOOST_BIND_ENABLE_STDCALL")
41-
ENDIF()
35+
set(boost_CXX_Flags "-DBOOST_ALL_NO_LIB=1")
36+
if(APPLE)
37+
list(APPEND boost_CXX_Flag "-DBOOST_LCAST_NO_WCHAR_T" "-DBOOST_THREAD_DONT_USE_ATOMIC")
38+
endif()
39+
if(WIN32)
40+
list(APPEND boost_CXX_Flag "-DBOOST_BIND_ENABLE_STDCALL")
41+
endif()
4242

43-
SET( boost_DEPENDENCIES )
43+
set( boost_DEPENDENCIES )
4444

4545
# explicitly set library list
46-
SET(boost_Libraries
46+
set(boost_Libraries
4747
"atomic"
4848
"date_time"
4949
"exception"
@@ -53,27 +53,27 @@ SET(boost_Libraries
5353
"thread"
5454
CACHE INTERNAL "Boost library name.")
5555

56-
IF(BUILD_WITH_PYTHON)
57-
ADD_DEFINITIONS(-DBOOST_PYTHON_STATIC_LIB=1)
58-
LIST(APPEND boost_Libraries python)
59-
LIST(APPEND boost_DEPENDENCIES Python_external)
60-
LIST(APPEND boost_CXX_Flag "-DBOOST_PYTHON_STATIC_MODULE" "-DBOOST_PYTHON_STATIC_LIB")
61-
ENDIF()
56+
if(BUILD_WITH_PYTHON)
57+
add_definitions(-DBOOST_PYTHON_STATIC_LIB=1)
58+
list(APPEND boost_Libraries python)
59+
list(APPEND boost_DEPENDENCIES Python_external)
60+
list(APPEND boost_CXX_Flag "-DBOOST_PYTHON_STATIC_MODULE" "-DBOOST_PYTHON_STATIC_LIB")
61+
endif()
6262

6363
# TODO: set up 64-bit build detection
6464
# Boost Jam needs to have 64-bit build explicitly configured
65-
IF(WIN32)
66-
SET(FORCE_64BIT_BUILD ON)
67-
SET(boost_GIT_TAG "origin/v1.67.0")
68-
ELSE()
69-
SET(boost_GIT_TAG "origin/v1.58.0")
70-
ENDIF()
65+
if(WIN32)
66+
set(FORCE_64BIT_BUILD ON)
67+
set(boost_GIT_TAG "origin/v1.67.0")
68+
else()
69+
set(boost_GIT_TAG "origin/v1.58.0")
70+
endif()
7171

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

74-
IF(TRAVIS_BUILD)
75-
LIST(APPEND boost_CXX_Flag "-w")
76-
ENDIF()
74+
if(TRAVIS_BUILD)
75+
list(APPEND boost_CXX_Flag "-w")
76+
endif()
7777

7878
# TODO: fix install step
7979
#
@@ -99,24 +99,24 @@ ExternalProject_Add(Boost_external
9999

100100
ExternalProject_Get_Property(Boost_external INSTALL_DIR)
101101
ExternalProject_Get_Property(Boost_external SOURCE_DIR)
102-
SET(SCI_BOOST_INCLUDE ${SOURCE_DIR})
103-
SET(SCI_BOOST_LIBRARY_DIR ${SOURCE_DIR}/lib)
104-
SET(SCI_BOOST_USE_FILE ${INSTALL_DIR}/UseBoost.cmake)
102+
set(SCI_BOOST_INCLUDE ${SOURCE_DIR})
103+
set(SCI_BOOST_LIBRARY_DIR ${SOURCE_DIR}/lib)
104+
set(SCI_BOOST_USE_FILE ${INSTALL_DIR}/UseBoost.cmake)
105105

106-
SET(BOOST_PREFIX "boost_")
107-
SET(THREAD_POSTFIX "-mt")
106+
set(BOOST_PREFIX "boost_")
107+
set(THREAD_POSTFIX "-mt")
108108

109-
SET(SCI_BOOST_LIBRARY)
109+
set(SCI_BOOST_LIBRARY)
110110

111-
FOREACH(lib ${boost_Libraries})
112-
SET(LIB_NAME "${BOOST_PREFIX}${lib}${THREAD_POSTFIX}")
113-
LIST(APPEND SCI_BOOST_LIBRARY ${LIB_NAME})
114-
ENDFOREACH()
111+
foreach(lib ${boost_Libraries})
112+
set(LIB_NAME "${BOOST_PREFIX}${lib}${THREAD_POSTFIX}")
113+
list(APPEND SCI_BOOST_LIBRARY ${LIB_NAME})
114+
endforeach()
115115

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

120-
SET(Boost_DIR ${INSTALL_DIR} CACHE PATH "")
120+
set(Boost_DIR ${INSTALL_DIR} CACHE PATH "")
121121

122-
MESSAGE(STATUS "Boost_DIR: ${Boost_DIR}")
122+
message(STATUS "Boost_DIR: ${Boost_DIR}")

‎Superbuild/CMakeLists.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2525
# DEALINGS IN THE SOFTWARE.
2626

27-
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9 FATAL_ERROR)
28-
#CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
29-
#CMAKE_MINIMUM_REQUIRED(VERSION 3.0 FATAL_ERROR)
30-
IF(POLICY CMP0053)
31-
CMAKE_POLICY(SET CMP0053 OLD)
32-
ENDIF()
33-
IF(POLICY CMP0054)
34-
CMAKE_POLICY(SET CMP0054 NEW)
35-
ENDIF()
27+
cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
28+
#cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
29+
#cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
30+
if(POLICY CMP0053)
31+
cmake_policy(SET CMP0053 OLD)
32+
endif()
33+
if(POLICY CMP0054)
34+
cmake_policy(SET CMP0054 NEW)
35+
endif()
3636

3737

38-
PROJECT(Superbuild)
38+
project(Superbuild)
3939

40-
INCLUDE(${CMAKE_SOURCE_DIR}/Superbuild.cmake)
40+
include(${CMAKE_SOURCE_DIR}/Superbuild.cmake)

‎Superbuild/DataExternal.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2525
# DEALINGS IN THE SOFTWARE.
2626

27-
SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
27+
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
2828

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

33-
SET(data_DIR "${SEG3D_BINARY_DIR}/Seg3DData")
33+
set(data_DIR "${SEG3D_BINARY_DIR}/Seg3DData")
3434

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

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

50-
MESSAGE(STATUS "TEST_INPUT_PATH: ${TEST_INPUT_PATH}")
50+
message(STATUS "TEST_INPUT_PATH: ${TEST_INPUT_PATH}")

‎Superbuild/EigenExternal.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2525
# DEALINGS IN THE SOFTWARE.
2626

27-
SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
27+
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
2828

2929
# TODO: test on Windows
3030
ExternalProject_Add(Eigen_external
@@ -37,6 +37,6 @@ ExternalProject_Add(Eigen_external
3737
)
3838

3939
ExternalProject_Get_Property(Eigen_external SOURCE_DIR)
40-
SET(Eigen_DIR ${SOURCE_DIR} CACHE PATH "")
40+
set(Eigen_DIR ${SOURCE_DIR} CACHE PATH "")
4141

42-
MESSAGE(STATUS "Eigen_DIR: ${Eigen_DIR}")
42+
message(STATUS "Eigen_DIR: ${Eigen_DIR}")

‎Superbuild/FreetypeExternal.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2525
# DEALINGS IN THE SOFTWARE.
2626

27-
SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28-
SET(freetype_GIT_TAG "origin/master")
27+
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28+
set(freetype_GIT_TAG "origin/master")
2929

30-
IF(TRAVIS_BUILD)
31-
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
32-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
33-
ENDIF()
30+
if(TRAVIS_BUILD)
31+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
32+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
33+
endif()
3434

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

5151
ExternalProject_Get_Property(Freetype_external BINARY_DIR)
52-
SET(Freetype_DIR ${BINARY_DIR} CACHE PATH "")
52+
set(Freetype_DIR ${BINARY_DIR} CACHE PATH "")
5353

54-
MESSAGE(STATUS "Freetype_DIR: ${Freetype_DIR}")
54+
message(STATUS "Freetype_DIR: ${Freetype_DIR}")

‎Superbuild/GlewExternal.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2525
# DEALINGS IN THE SOFTWARE.
2626

27-
SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28-
SET(glew_GIT_TAG "origin/master")
27+
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28+
set(glew_GIT_TAG "origin/master")
2929

30-
IF(TRAVIS_BUILD)
31-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
32-
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
33-
ENDIF()
30+
if(TRAVIS_BUILD)
31+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
32+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
33+
endif()
3434

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

5151
ExternalProject_Get_Property(Glew_external BINARY_DIR)
52-
SET(Glew_DIR ${BINARY_DIR} CACHE PATH "")
52+
set(Glew_DIR ${BINARY_DIR} CACHE PATH "")
5353

54-
MESSAGE(STATUS "Glew_DIR: ${Glew_DIR}")
54+
message(STATUS "Glew_DIR: ${Glew_DIR}")

‎Superbuild/ITKExternal.cmake‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2525
# DEALINGS IN THE SOFTWARE.
2626

27-
SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
27+
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
2828

29-
SET(itk_ARGS
29+
set(itk_ARGS
3030
"-DBUILD_SHARED_LIBS:BOOL=OFF"
3131
"-DITK_BUILD_SHARED_LIBS:BOOL=OFF"
3232
"-DBUILD_EXAMPLES:BOOL=OFF"
@@ -35,17 +35,17 @@ SET(itk_ARGS
3535
"-DITK_INSTALL_NO_DEVELOPMENT:BOOL=OFF"
3636
)
3737

38-
IF(TRAVIS_BUILD)
39-
LIST(APPEND itk_ARGS
38+
if(TRAVIS_BUILD)
39+
list(APPEND itk_ARGS
4040
"-Wno-dev"
4141
"-Wno-deprecated"
4242
)
4343

44-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
45-
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
46-
ENDIF()
44+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
45+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
46+
endif()
4747

48-
SET(itk_CACHE_ARGS
48+
set(itk_CACHE_ARGS
4949
"-DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}"
5050
"-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}"
5151
"-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>"
@@ -78,17 +78,17 @@ SET(itk_CACHE_ARGS
7878
"-DCMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY:STATIC=${CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY}"
7979
)
8080

81-
IF(BUILD_MOSAIC_TOOLS)
82-
LIST(APPEND itk_CACHE_ARGS
81+
if(BUILD_MOSAIC_TOOLS)
82+
list(APPEND itk_CACHE_ARGS
8383
"-DITK_USE_FFTWD:BOOL=ON"
8484
"-DITK_USE_FFTWF:BOOL=ON"
8585
"-DModule_ITKImageIntensity:BOOL=ON"
8686
"-DModule_ITKThresholding:BOOL=ON"
8787
"-DModule_ITKTransformFactory:BOOL=ON"
8888
)
89-
ENDIF()
89+
endif()
9090

91-
SET(itk_GIT_TAG "v5.1.2")
91+
set(itk_GIT_TAG "v5.1.2")
9292

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

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

108-
MESSAGE(STATUS "ITK_DIR=${ITK_DIR}")
108+
message(STATUS "ITK_DIR=${ITK_DIR}")

‎Superbuild/ImplicitFunctionExternal.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2525
# DEALINGS IN THE SOFTWARE.
2626

27-
SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28-
SET(implicitFunction_GIT_TAG "origin/master")
29-
SET(implicitFunction_DEPENDENCIES "Tetgen_external;Eigen_external")
27+
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28+
set(implicitFunction_GIT_TAG "origin/master")
29+
set(implicitFunction_DEPENDENCIES "Tetgen_external;Eigen_external")
3030

31-
IF(TRAVIS_BUILD)
32-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
33-
ENDIF()
31+
if(TRAVIS_BUILD)
32+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
33+
endif()
3434

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

5959
ExternalProject_Get_Property(ImplicitFunction_external BINARY_DIR)
60-
SET(ImplicitFunction_DIR ${BINARY_DIR} CACHE PATH "")
60+
set(ImplicitFunction_DIR ${BINARY_DIR} CACHE PATH "")
6161

62-
MESSAGE(STATUS "ImplicitFunction_DIR: ${ImplicitFunction_DIR}")
62+
message(STATUS "ImplicitFunction_DIR: ${ImplicitFunction_DIR}")

‎Superbuild/LibPNGExternal.cmake‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2525
# DEALINGS IN THE SOFTWARE.
2626

27-
SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28-
SET(libpng_GIT_TAG "origin/master")
29-
SET(libpng_DEPENDENCIES "Zlib_external")
27+
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28+
set(libpng_GIT_TAG "origin/master")
29+
set(libpng_DEPENDENCIES "Zlib_external")
3030

31-
IF(TRAVIS_BUILD)
32-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
33-
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
34-
ENDIF()
31+
if(TRAVIS_BUILD)
32+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
33+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
34+
endif()
3535

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

5656
ExternalProject_Get_Property(LibPNG_external BINARY_DIR)
57-
SET(LibPNG_DIR ${BINARY_DIR} CACHE PATH "")
57+
set(LibPNG_DIR ${BINARY_DIR} CACHE PATH "")
5858

59-
MESSAGE(STATUS "LibPNG_DIR: ${LibPNG_DIR}")
59+
message(STATUS "LibPNG_DIR: ${LibPNG_DIR}")

0 commit comments

Comments
 (0)