From 67afd2acef9bd97807acd4a6528942fe20728a3a Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 26 Oct 2009 00:15:47 +0100 Subject: [PATCH] Build system: various fixes for CPU objects Also make use of user-specified compiler flags when building CPU objects. Furthermore do not add CPU objects to lmms_SOURCES rather than listing them at ADD_EXECUTABLE. This fixes warnings when updating localizations. --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20b0dee62..56955066e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -499,15 +499,15 @@ FOREACH(opt_target ${opt_targets}) IF("${CMAKE_C_COMPILER_ARG1}" STREQUAL " gcc") SET(CMAKE_C_COMPILER_ARG1 gcc) ENDIF("${CMAKE_C_COMPILER_ARG1}" STREQUAL " gcc") - SET(COMPILE_CMD ${CMAKE_C_COMPILER} ${CPU_X86_C} -O2 -fno-stack-protector -ftree-vectorize -fomit-frame-pointer -c -I${CMAKE_SOURCE_DIR}/include -I${CMAKE_BINARY_DIR} -g0 -DBUILD_${OPT_TARGET} -m${opt_target} ${FPMATH_FLAGS}) + SET(CFLAGS ${CMAKE_C_FLAGS}) + SEPARATE_ARGUMENTS(CFLAGS) + SET(COMPILE_CMD ${CMAKE_C_COMPILER} ${CPU_X86_C} ${CFLAGS} -O2 -fno-stack-protector -ftree-vectorize -fomit-frame-pointer -c -I${CMAKE_SOURCE_DIR}/include -I${CMAKE_BINARY_DIR} -g0 -DBUILD_${OPT_TARGET} -m${opt_target} ${FPMATH_FLAGS}) ADD_CUSTOM_COMMAND(OUTPUT ${CPU_X86_TARGET_O} COMMAND ${COMPILE_CMD} -o ${CPU_X86_TARGET_O} DEPENDS ${CPU_X86_C}) ADD_CUSTOM_TARGET(debug-${opt_target} COMMAND ${COMPILE_CMD} -o ${CPU_X86_TARGET_O}.s -S -ftree-vectorizer-verbose=2) SET(cpu_objects ${cpu_objects} ${CPU_X86_TARGET_O}) ENDFOREACH(opt_target ${opt_targets}) - SET(lmms_SOURCES ${lmms_SOURCES} ${cpu_objects}) - ENDIF(LMMS_HOST_X86 OR LMMS_HOST_X86_64) @@ -547,7 +547,7 @@ LINK_LIBRARIES(${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PORTAUDIO_LIBR ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/lmms.1.gz COMMAND gzip -c ${CMAKE_SOURCE_DIR}/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz DEPENDS ${CMAKE_SOURCE_DIR}/lmms.1 COMMENT "Generating lmms.1.gz") -ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${LIBSAMPLERATE_SOURCES} ${LMMS_ER_H} ${lmms_UI_out} lmmsconfig.h lmmsversion.h ${WINRC} ${CMAKE_BINARY_DIR}/lmms.1.gz) +ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${cpu_objects} ${lmms_INCLUDES} ${LIBSAMPLERATE_SOURCES} ${LMMS_ER_H} ${lmms_UI_out} lmmsconfig.h lmmsversion.h ${WINRC} ${CMAKE_BINARY_DIR}/lmms.1.gz) IF(LMMS_BUILD_WIN32)