SVN commit 826545 by sengels: compile juk with mingw if you have any questions or need help about cmake, don't hesitate to ask me M +3 -1 CMakeLists.txt M +5 -1 juk/CMakeLists.txt M +5 -2 juk/tests/CMakeLists.txt --- trunk/KDE/kdemultimedia/CMakeLists.txt #826544:826545 @@ -28,7 +28,9 @@ add_subdirectory(cmake) macro_optional_add_subdirectory(doc) add_subdirectory(libkcddb) -add_subdirectory(libkcompactdisc) +if(NOT WIN32) + add_subdirectory(libkcompactdisc) +endif(NOT WIN32) if (TAGLIB_FOUND) macro_optional_add_subdirectory(juk) --- trunk/KDE/kdemultimedia/juk/CMakeLists.txt #826544:826545 @@ -23,7 +23,11 @@ ########### next target ############### # hack, should taglib maybe give the .. directory as well in it's config file? -add_definitions(${TAGLIB_CFLAGS} "${TAGLIB_CFLAGS}/..") +if(WIN32) + include_directories( ${TAGLIB_INCLUDES} ${TAGLIB_INCLUDES}/.. ) +else(WIN32) + add_definitions( ${TAGLIB_CFLAGS} "${TAGLIB_CFLAGS}/.." ) +endif(WIN32) add_definitions(-DKDE_DEFAULT_DEBUG_AREA=65432) add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DQT_STL) --- trunk/KDE/kdemultimedia/juk/tests/CMakeLists.txt #826544:826545 @@ -4,8 +4,11 @@ ########### next target ############### # hack, should taglib maybe give the .. directory as well in it's config file? -add_definitions(${TAGLIB_CFLAGS} "${TAGLIB_CFLAGS}/..") - +if(WIN32) + include_directories( ${TAGLIB_INCLUDES} ${TAGLIB_INCLUDES}/.. ) +else(WIN32) + add_definitions( ${TAGLIB_CFLAGS} "${TAGLIB_CFLAGS}/.." ) +endif(WIN32) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ) add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)