Git commit 3ac1232f1f43f72cd7c0a1a37a35301432b46ed5 by Till Adam. Committed on 12/02/2012 at 13:18. Pushed by tilladam into branch 'master'. Don't hardcode QtCore's library name, make the try_compile debuggable. This fixes the build against QtCore libs that have a debug appendix, like for example on Mac. M +3 -2 kalarm/CMakeLists.txt http://commits.kde.org/kdepim/3ac1232f1f43f72cd7c0a1a37a35301432b46ed5 diff --git a/kalarm/CMakeLists.txt b/kalarm/CMakeLists.txt index 15743a2..81e51dc 100644 --- a/kalarm/CMakeLists.txt +++ b/kalarm/CMakeLists.txt @@ -227,11 +227,12 @@ int main() { return 0; }") set(_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/check_kalarmcal_akonadi.= cpp) file(WRITE "${_source_file}" "${_source}") set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=3D${KDE4_INCLUDES}") + set(_try_kalarm_akonadi_compile) try_compile(HAVE_PIMLIBS_AKONADI ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs};${QT_INCLUDE_DIR}" LINK_DIRECTORIES "-DLINK_DIRECTORIES:STRING=3D${QT_LIBRARY_DIR}" - LINK_LIBRARIES "-DLINK_LIBRARIES:STRING=3DQtCore" - COMPILE_OUTPUT_VARIABLE _compile_output_var) + LINK_LIBRARIES "-DLINK_LIBRARIES:STRING=3D${QT4_QTCORE_LIB= RARY}" + OUTPUT_VARIABLE _try_kalarm_akonadi_compile ) = if(KALARM_USE_AKONADI AND NOT HAVE_PIMLIBS_AKONADI) message(FATAL_ERROR "\nIncompatible build options between KAlarm a= nd kdepimlibs/kalarmcal.