From 97ca022d0af441a720abd542ce9a06f7a086ef27 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Wed, 23 Jul 2008 15:05:25 +0000 Subject: [PATCH] do not compile with -O3 when using GCC 4.1.x as this version segfaults while optimizing git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1367 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 17 +++++++++++++++++ plugins/ladspa_effect/caps/CMakeLists.txt | 13 +++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3e92ebae..13dedd46e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2008-07-23 Tobias Doerffel + + * plugins/ladspa_effect/caps/CMakeLists.txt: + do not compile with -O3 when using GCC 4.1.x as this version segfaults + while optimizing + + * plugins/spectrum_analyzer/spectrum_analyzer.cpp: + * include/effect_lib.h: + fixed compiler-warnings + + * src/core/midi/midi_winmm.cpp: + * src/core/midi/midi_alsa_seq.cpp: + fixed subscribe/unsubscribe-warnings + + * CMakeLists.txt: + fixes for cmake 2.4 + 2008-07-22 Tobias Doerffel * cmake/modules/BuildPlugin.cmake: diff --git a/plugins/ladspa_effect/caps/CMakeLists.txt b/plugins/ladspa_effect/caps/CMakeLists.txt index 34d977faa..d989314b3 100644 --- a/plugins/ladspa_effect/caps/CMakeLists.txt +++ b/plugins/ladspa_effect/caps/CMakeLists.txt @@ -1,9 +1,18 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include") -#SET(CMAKE_BUILD_TYPE release) FILE(GLOB SOURCES *.cc) ADD_LIBRARY(caps SHARED ${SOURCES}) SET_TARGET_PROPERTIES(caps PROPERTIES PREFIX "") -SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-O3 -Wno-write-strings") +EXEC_PROGRAM(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) +STRING(REGEX MATCH "4\\.1\\.[0-9]" _gcc_is_4_1_x "${_gcc_version_info}") +STRING(LENGTH "${_gcc_is_4_1_x}" NO_O3) +IF(NO_O3) + MESSAGE("Found GCC 4.1.x - compiling CAPS-plugins with -O2 instead of -O3") + SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-Wno-write-strings") +ELSE(NO_O3) + SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-O3 -Wno-write-strings") +ENDIF(NO_O3) + + SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined") IF(LMMS_BUILD_LINUX) SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles")