From c40ad0d0e2697b1c29f10c9bffbe774ceb047340 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Wed, 23 Jul 2008 15:03:29 +0000 Subject: [PATCH] fixes for cmake 2.4 git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1364 0778d3d1-df1d-0410-868b-ea421aaaa00d --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2af70e0c..08405433a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.0) +CMAKE_MINIMUM_REQUIRED(VERSION 2.4) PROJECT(lmms) @@ -110,7 +110,7 @@ IF(EXISTS "${QT_TRANSLATIONS_DIR}") ADD_DEFINITIONS(-D'QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"') ENDIF(EXISTS "${QT_TRANSLATIONS_DIR}") IF(NOT WIN32) - STRING(REGEX REPLACE "-DQT_DLL" "" QT_DEFINITIONS "${QT_DEFINITIONS}") + STRING(REPLACE "-DQT_DLL" "" QT_DEFINITIONS "${QT_DEFINITIONS}") ENDIF(NOT WIN32) INCLUDE(${QT_USE_FILE}) @@ -299,7 +299,7 @@ GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION) SET(ER_H embedded_resources.h) # we somehow have to make LMMS-binary depend on MOC-files -ADD_FILE_DEPENDENCIES(${ER_H} ${lmms_MOC_out}) +ADD_FILE_DEPENDENCIES(lmmsconfig.h ${lmms_MOC_out}) ADD_CUSTOM_COMMAND(OUTPUT ${ER_H} COMMAND ${BIN2RES} ARGS ${lmms_EMBEDDED_RESOURCES} > ${ER_H} DEPENDS ${BIN2RES}) @@ -321,7 +321,7 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOUR LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS}) LINK_LIBRARIES(${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES}) -ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${LIBSAMPLERATE_SOURCES} ${ER_H} ${lmms_UI_out}) +ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${LIBSAMPLERATE_SOURCES} ${ER_H} ${lmms_UI_out} lmmsconfig.h) INSTALL(TARGETS lmms RUNTIME DESTINATION bin)