Commit a4f91175 authored by Victor Yacovlev's avatar Victor Yacovlev

MacOS X build fix

parent 44e296f0
......@@ -15,10 +15,12 @@ set(CMAKE_INSTALL_RPATH "")
set(CMAKE_INSTALL_RPATH "${Qt5_DIR}/../../")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,'${Qt5_DIR}/../../'")
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
if("${isSystemDir}" STREQUAL "-1")
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
endif()
if("${isSystemDir}" STREQUAL "-1")
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
endif()
set(KUMIR2_SDK_SCRIPTS_DIR "${KUMIR2_RESOURCES_DIR}/devel")
set(KUMIR2_SDK_CMAKE_DIR "${KUMIR2_RESOURCES_DIR}/devel/cmake")
# Compile flags
set(KUMIR2_CXXFLAGS "-fno-exceptions -std=c++0x -fPIC -DAPPLE")
......
......@@ -107,6 +107,9 @@ function(kumir2_qt_moc INFILE FILE_LOCATION)
foreach(def ${DEF_LIST})
file(APPEND ${PARAMS_FILE_NAME} "-D${def}\n")
endforeach()
if(APPLE AND ${USE_QT} GREATER 4)
file(APPEND ${PARAMS_FILE_NAME} "-F${Qt5_DIR}/../../\n")
endif()
file(APPEND ${PARAMS_FILE_NAME} "-o\n")
file(APPEND ${PARAMS_FILE_NAME} "${OF}\n")
file(APPEND ${PARAMS_FILE_NAME} "${FILE_LOCATION}/${INFILE}\n")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment