From 03e9889605fbe729bc479412b9d1767f5b39103d Mon Sep 17 00:00:00 2001 From: Lukas W Date: Wed, 29 Nov 2017 17:32:59 +0100 Subject: [PATCH] Remove old CMake compat code --- src/CMakeLists.txt | 35 +++++++++++------------------------ tests/CMakeLists.txt | 5 ----- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 624fd5dc3..42b846cf4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -99,30 +99,17 @@ IF(LMMS_BUILD_LINUX) ENDIF() SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -# ADD_LIBRARY's OBJECT is only supported in CMake >=2.8.8 -IF(CMAKE_VERSION VERSION_GREATER "2.8.7") - - ADD_LIBRARY(lmmsobjs OBJECT - ${LMMS_SRCS} - ${LMMS_INCLUDES} - ${LMMS_UI_OUT} - ${LMMS_RCC_OUT} - ) - ADD_EXECUTABLE(lmms - core/main.cpp - $ - "${WINRC}" - ) -ELSE() - ADD_EXECUTABLE(lmms - core/main.cpp - ${LMMS_SRCS} - ${LMMS_INCLUDES} - ${LMMS_UI_OUT} - ${LMMS_RCC_OUT} - "${WINRC}" - ) -ENDIF() +ADD_LIBRARY(lmmsobjs OBJECT + ${LMMS_SRCS} + ${LMMS_INCLUDES} + ${LMMS_UI_OUT} + ${LMMS_RCC_OUT} +) +ADD_EXECUTABLE(lmms + core/main.cpp + $ + "${WINRC}" +) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} ${LMMS_UI_OUT} lmmsconfig.h lmms.1.gz") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index bb846ea69..ca78a5eb4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,8 +1,3 @@ -IF(CMAKE_VERSION VERSION_LESS 2.8.8) - MESSAGE("-- Unit tests are only available in CMake >=2.8.8. You have ${CMAKE_VERSION}") - RETURN() -ENDIF() - INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}") INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}") INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")