liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes macOS autobuild (#5674)

Browse Source 
* 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:
Benitoite
2020-02-28 10:20:40 -08:00
committed by GitHub
parent c7c1dec9cb
commit fbe718b64f
10 changed files with 193 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtgui/CMakeLists.txt
View File

@@ -164,13 +164,13 @@ set(NONCLISOURCEFILES
zoompanel.cc
)
include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
if(APPLE)
find_package(MacIntegration REQUIRED)
# At the time of writing CMake has no module finder for gtkmacintegration so here we have it hard-coded, if installed via macports it should be in /opt/local/...
set(EXTRA_LIB_RTGUI ${MacIntegration_LIBRARIES})
set(EXTRA_INCDIR ${EXTRA_INCDIR} ${MacIntegration_INCLUDE_DIRS})
set(EXTRA_LIB_RTGUI "${MacIntegration_LIBRARIES}")
set(EXTRA_INCDIR "${EXTRA_INCDIR}" "${MacIntegration_INCLUDE_DIRS}")
endif()
if(WIN32)
@@ -236,16 +236,16 @@ else()
endif()
# Excluding libatomic needed by Clang/FreeBSD, #3636
if(OPENMP_FOUND AND NOT APPLE AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
set(EXTRA_LIB_RTGUI ${EXTRA_LIB_RTGUI} "atomic")
if(OPENMP_FOUND AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
set(EXTRA_LIB_RTGUI "${EXTRA_LIB_RTGUI}" "atomic")
endif()
# Create config.h which defines where data are stored
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h")
# Create new executables targets
add_executable(rth ${EXTRA_SRC_NONCLI} ${NONCLISOURCEFILES})
add_executable(rth-cli ${EXTRA_SRC_CLI} ${CLISOURCEFILES})
add_executable(rth "${EXTRA_SRC_NONCLI}" "${NONCLISOURCEFILES}")
add_executable(rth-cli "${EXTRA_SRC_CLI}" "${CLISOURCEFILES}")
# Add dependencies to executables targets
add_dependencies(rth UpdateInfo)
@@ -311,5 +311,5 @@ target_link_libraries(rth-cli rtengine
)
# Install executables
install(TARGETS rth DESTINATION ${BINDIR})
install(TARGETS rth-cli DESTINATION ${BINDIR})
install(TARGETS rth DESTINATION "${BINDIR}")
install(TARGETS rth-cli DESTINATION "${BINDIR}")