fixes macOS autobuild (#5674)
* update macOS autobuild yaml * updates */CMakeLists* for macOS autobuild compatibility * "" a dir for cmake * Un empty an empty EXTRA_INCDIR * use a cmake operator * Use the . dir to un-empty a string * fix minutes timer in macos yaml * test & skip instead of load & include * disregard fractional part of minutes in mac yaml * add another cmake test * fix typo in mac yaml * fix other part of same typo * correct a filename in mac yaml * test all include dirs * fix of mac yaml * mac:fix a path in yaml * mac:and its antecedent * options.h include a dir * test __has_include (gcc 5.* & up & clang) * remove a printf() in mac yaml * mac:change a "" and an elseif() to else() * fix a whitespace error * fix 2 whitespace errors * ZULU>UTC * add a "UTC * on the other side of the " * mac:properly set default LOCAL_PREFIX in CACHE * use of zsh subshells in macos yaml * mac:remove some && * mac:remove some " * mac:floating point divisors * mac:use double paren (()) * mac:add a dir * mac:floatize with decimal point * mac:zsh -c certain lines * remove a marker
This commit is contained in:
@@ -1,8 +1,14 @@
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
# Use of SOURCE_DIR target property begins at cmake 3.7
|
||||
if(APPLE)
|
||||
cmake_minimum_required(VERSION 3.7)
|
||||
else()
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
endif()
|
||||
|
||||
# Compiler id for Apple Clang
|
||||
if(APPLE)
|
||||
cmake_policy(SET CMP0025 NEW)
|
||||
cmake_policy(SET CMP0037 NEW)
|
||||
endif()
|
||||
|
||||
# Must stay before the project() command:
|
||||
@@ -145,7 +151,7 @@ if(WIN32)
|
||||
CACHE STRING "Additional search paths")
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
if(APPLE) # TODO make -mtune generic conditional and/or specifiable.
|
||||
if(CMAKE_CXX_COMPILER MATCHES "g\\+\\+-mp-4.[5-8]"
|
||||
OR CMAKE_CXX_COMPILER_ARG1 MATCHES "g\\+\\+-mp-4.[5-8]")
|
||||
set(CMAKE_EXE_LINKER_FLAGS
|
||||
@@ -210,7 +216,7 @@ endif()
|
||||
|
||||
if(NOT DEFINED BUNDLE_BASE_INSTALL_DIR)
|
||||
if(APPLE)
|
||||
set(BUNDLE_BASE_INSTALL_DIR "${CMAKE_BUILD_TYPE}/MacOS")
|
||||
set(BUNDLE_BASE_INSTALL_DIR "${PROJECT_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/MacOS")
|
||||
else()
|
||||
set(BUNDLE_BASE_INSTALL_DIR "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
|
||||
endif()
|
||||
@@ -219,7 +225,7 @@ endif()
|
||||
if(BUILD_BUNDLE)
|
||||
if(APPLE)
|
||||
set(BINDIR "${BUNDLE_BASE_INSTALL_DIR}")
|
||||
set(CMAKE_INSTALL_PREFIX ".")
|
||||
set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/build")
|
||||
else()
|
||||
set(BINDIR .)
|
||||
set(CMAKE_INSTALL_PREFIX "${BUNDLE_BASE_INSTALL_DIR}")
|
||||
@@ -233,7 +239,7 @@ endif()
|
||||
if(NOT DEFINED DATADIR)
|
||||
if(BUILD_BUNDLE)
|
||||
if(APPLE)
|
||||
set(DATADIR "${CMAKE_BUILD_TYPE}/Resources/share")
|
||||
set(DATADIR "${PROJECT_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/Resources/share")
|
||||
else()
|
||||
set(DATADIR .)
|
||||
endif()
|
||||
@@ -245,7 +251,7 @@ endif()
|
||||
if(NOT DEFINED LIBDIR)
|
||||
if(BUILD_BUNDLE)
|
||||
if(APPLE)
|
||||
set(LIBDIR "${CMAKE_BUILD_TYPE}/Frameworks")
|
||||
set(LIBDIR "${PROJECT_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/Frameworks")
|
||||
else()
|
||||
set(LIBDIR .)
|
||||
endif()
|
||||
@@ -362,8 +368,10 @@ if(APPLE)
|
||||
set(LOCAL_PREFIX
|
||||
"${LOCAL_PREFIX}"
|
||||
CACHE STRING "macos/gtk parent directory ie /usr or /opt")
|
||||
elseif(NOT DEFINED LOCAL_PREFIX)
|
||||
set(LOCAL_PREFIX "/usr")
|
||||
else()
|
||||
set(LOCAL_PREFIX
|
||||
/usr
|
||||
CACHE STRING "macos/gtk parent directory ie /usr or /opt")
|
||||
endif()
|
||||
if("${FANCY_DMG}")
|
||||
set(FANCY_DMG
|
||||
@@ -612,12 +620,10 @@ else()
|
||||
set(PROC_BIT_DEPTH 64 bits)
|
||||
endif()
|
||||
|
||||
# Get compiler name and version. Only CMake > 2.8.7 knows
|
||||
# CMAKE_*_COMPILER_VERSION
|
||||
if(CMAKE_VERSION VERSION_GREATER 2.8.7)
|
||||
# Get compiler name and version.
|
||||
get_filename_component(COMPILER_INFO ${CMAKE_C_COMPILER} NAME_WE)
|
||||
set(COMPILER_INFO "${COMPILER_INFO} ${CMAKE_C_COMPILER_VERSION}")
|
||||
else()
|
||||
if(NOT APPLE)
|
||||
execute_process(
|
||||
COMMAND gcc -dumpversion
|
||||
OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
@@ -633,15 +639,18 @@ set(LFLAGS
|
||||
"${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}"
|
||||
)
|
||||
|
||||
set(ABOUT_COMMAND_WITH_ARGS
|
||||
${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR:STRING=${PROJECT_SOURCE_DIR}
|
||||
-DCACHE_NAME_SUFFIX:STRING=${CACHE_NAME_SUFFIX}
|
||||
-DPROC_LABEL:STRING="${PROC_LABEL}"
|
||||
-DPROC_BIT_DEPTH:STRING="${PROC_BIT_DEPTH}"
|
||||
-DBUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
||||
-DGTKMM_VERSION:STRING=${GTKMM_VERSION} -DOPTION_OMP:STRING=${OPTION_OMP}
|
||||
-DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
|
||||
-DLENSFUN_VERSION:STRING=${LENSFUN_VERSION})
|
||||
if(NOT APPLE)
|
||||
set(ABOUT_COMMAND_WITH_ARGS
|
||||
${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR:STRING=${PROJECT_SOURCE_DIR}
|
||||
-DCACHE_NAME_SUFFIX:STRING=${CACHE_NAME_SUFFIX}
|
||||
-DPROC_LABEL:STRING="${PROC_LABEL}"
|
||||
-DPROC_BIT_DEPTH:STRING="${PROC_BIT_DEPTH}"
|
||||
-DBUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
||||
-DGTKMM_VERSION:STRING=${GTKMM_VERSION}
|
||||
-DOPTION_OMP:STRING=${OPTION_OMP}
|
||||
-DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
|
||||
-DLENSFUN_VERSION:STRING=${LENSFUN_VERSION})
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
list(
|
||||
@@ -654,16 +663,19 @@ if(WIN32)
|
||||
-DCMAKE_INSTALL_PREFIX:STRING="${CMAKE_INSTALL_PREFIX}"
|
||||
-DBIT_DEPTH:STRING="${CMAKE_SIZEOF_VOID_P}")
|
||||
elseif(APPLE)
|
||||
list(APPEND ABOUT_COMMAND_WITH_ARGS -DSYSTEM:STRING=Apple
|
||||
-DCXX_FLAGS:STRING=${CXX_FLAGS} -DLFLAGS:STRING=${LFLAGS}
|
||||
-DCOMPILER_INFO:STRING=${COMPILER_INFO})
|
||||
set(
|
||||
ABOUT_COMMAND_WITH_ARGS
|
||||
cmake -DPROJECT_SOURCE_DIR:STRING=${PROJECT_SOURCE_DIR} -P ${PROJECT_SOURCE_DIR}/UpdateInfo.cmake -DSYSTEM:STRING=Apple -DCXX_FLAGS:STRING=${CXX_FLAGS} -DLFLAGS:STRING=${LFLAGS} -DCOMPILER_INFO:STRING=${COMPILER_INFO} -DCACHE_NAME_SUFFIX:STRING=${CACHE_NAME_SUFFIX})
|
||||
else()
|
||||
list(APPEND ABOUT_COMMAND_WITH_ARGS -DSYSTEM:STRING=Linux
|
||||
-DCXX_FLAGS:STRING=${CXX_FLAGS} -DLFLAGS:STRING=${LFLAGS}
|
||||
-DCOMPILER_INFO:STRING=${COMPILER_INFO})
|
||||
endif()
|
||||
|
||||
list(APPEND ABOUT_COMMAND_WITH_ARGS -P "${PROJECT_SOURCE_DIR}/UpdateInfo.cmake")
|
||||
if(NOT APPLE)
|
||||
list(APPEND
|
||||
ABOUT_COMMAND_WITH_ARGS
|
||||
-P "${PROJECT_SOURCE_DIR}/UpdateInfo.cmake")
|
||||
endif()
|
||||
|
||||
add_custom_target(
|
||||
UpdateInfo ALL
|
||||
|
Reference in New Issue
Block a user