Attachment #412222 for bug #560796




cmake_minimum_required(VERSION 2.6)

set(CMAKE_C_FLAGS "-Wall -std=c99")
set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall")

include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
--
CMakeLists.txt                          | 2 +-
ext/clementine-tagreader/CMakeLists.txt | 2 +-
src/CMakeLists.txt                      | 2 +-
tests/CMakeLists.txt                    | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

Lines 158-164 if (WIN32) Link Here

(-)a/CMakeLists.txt (-1 / +1 lines)
158	SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -o <OBJECT> <SOURCE> -I ${CMAKE_SOURCE_DIR}/dist/windows")	158	SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -o <OBJECT> <SOURCE> -I ${CMAKE_SOURCE_DIR}/dist/windows")
159	endif(WIN32)	159	endif(WIN32)
160		160
161	add_definitions(-DQT_NO_CAST_TO_ASCII -DQT_STRICT_ITERATORS)	161	add_definitions(-DQT_NO_CAST_TO_ASCII -DQT_STRICT_ITERATORS -D__STRICT_ANSI__)
162		162
163	# Translations stuff	163	# Translations stuff
164	find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext PATHS /target/bin)	164	find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext PATHS /target/bin)

Lines 7-13 include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader) Link Here

(-)a/ext/clementine-tagreader/CMakeLists.txt (-1 / +1 lines)
7	include_directories(${CMAKE_SOURCE_DIR}/src)	7	include_directories(${CMAKE_SOURCE_DIR}/src)
8	include_directories(${CMAKE_BINARY_DIR}/src)	8	include_directories(${CMAKE_BINARY_DIR}/src)
9		9
10	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -U__STRICT_ANSI__")	10	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
11		11
12	set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})	12	set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
13		13

Lines 1-6 Link Here

(-)a/src/CMakeLists.txt (-1 / +1 lines)
1		1
2	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")	2	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
3	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__")	3	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option -Wno-deprecated-register --std=c++0x")
4		4
5	option(BUILD_WERROR "Build with -Werror" ON)	5	option(BUILD_WERROR "Build with -Werror" ON)
6		6

Lines 1-6 Link Here

(-)a/tests/CMakeLists.txt (-1 / +1 lines)
1	cmake_minimum_required(VERSION 2.6)	1	cmake_minimum_required(VERSION 2.6)
2		2
3	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fpermissive -Wno-c++11-narrowing -U__STRICT_ANSI__")	3	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fpermissive -Wno-c++11-narrowing")
4		4
5	if(USE_SYSTEM_GMOCK)	5	if(USE_SYSTEM_GMOCK)
6	include_directories(${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS})	6	include_directories(${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS})

Return to bug 560796

Lines 1-6 Link Here

(-)a/gst/moodbar/CMakeLists.txt (-2 / +1 lines)
1	cmake_minimum_required(VERSION 2.6)	1	cmake_minimum_required(VERSION 2.6)
2		2
3	set(CMAKE_C_FLAGS "-Wall")	3	set(CMAKE_C_FLAGS "-Wall -std=c99")
4	set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall")	4	set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall")
5		5
6	include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})	6	include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
7	--
8	CMakeLists.txt \| 2 +-	7	CMakeLists.txt \| 2 +-
9	ext/clementine-tagreader/CMakeLists.txt \| 2 +-	8	ext/clementine-tagreader/CMakeLists.txt \| 2 +-
10	src/CMakeLists.txt \| 2 +-	9	src/CMakeLists.txt \| 2 +-
11	tests/CMakeLists.txt \| 2 +-	10	tests/CMakeLists.txt \| 2 +-
12	4 files changed, 4 insertions(+), 4 deletions(-)	11	4 files changed, 4 insertions(+), 4 deletions(-)