Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 782721
Collapse All | Expand All

(-)a/cmake/modules/PopplerMacros.cmake (-74 / +4 lines)
Lines 79-92 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) Link Here
79
  set(CMAKE_BUILD_TYPE RelWithDebInfo)
79
  set(CMAKE_BUILD_TYPE RelWithDebInfo)
80
endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
80
endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
81
81
82
if(CMAKE_COMPILER_IS_GNUCXX)
83
  # set the default compile warnings
84
  set(_warn "-Wall -Wextra -Wpedantic")
82
  set(_warn "-Wall -Wextra -Wpedantic")
85
  set(_warn "${_warn} -Wno-unused-parameter")
83
  set(_warn "${_warn} -Wno-unused-parameter")
86
  set(_warn "${_warn} -Wcast-align")
84
  set(_warn "${_warn} -Wcast-align")
87
  set(_warn "${_warn} -Wformat-security")
85
  set(_warn "${_warn} -Wformat-security")
88
  set(_warn "${_warn} -Wframe-larger-than=65536")
86
  set(_warn "${_warn} -Wframe-larger-than=65536")
89
  set(_warn "${_warn} -Wlogical-op")
90
  set(_warn "${_warn} -Wmissing-format-attribute")
87
  set(_warn "${_warn} -Wmissing-format-attribute")
91
  set(_warn "${_warn} -Wnon-virtual-dtor")
88
  set(_warn "${_warn} -Wnon-virtual-dtor")
92
  set(_warn "${_warn} -Woverloaded-virtual")
89
  set(_warn "${_warn} -Woverloaded-virtual")
Lines 102-123 if(CMAKE_COMPILER_IS_GNUCXX) Link Here
102
99
103
  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
100
  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
104
  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
101
  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
105
102
  
106
  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
103
if(CMAKE_COMPILER_IS_GNUCXX)
107
  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
108
  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
109
  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
110
  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
111
  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
112
  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
113
  set(_save_cflags "${CMAKE_C_FLAGS}")
114
  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
115
  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
116
  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
117
  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
118
  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
119
  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
120
121
  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
104
  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
122
  if(GCC_HAS_AS_NEEDED)
105
  if(GCC_HAS_AS_NEEDED)
123
    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
106
    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
Lines 126-182 if(CMAKE_COMPILER_IS_GNUCXX) Link Here
126
  endif(GCC_HAS_AS_NEEDED)
109
  endif(GCC_HAS_AS_NEEDED)
127
endif (CMAKE_COMPILER_IS_GNUCXX)
110
endif (CMAKE_COMPILER_IS_GNUCXX)
128
111
129
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
112
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
130
# set the default compile warnings
113
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
131
  set(_warn "-Wall -Wextra -Wpedantic")
132
  set(_warn "${_warn} -Wno-unused-parameter")
133
  set(_warn "${_warn} -Wcast-align")
134
  set(_warn "${_warn} -Wformat-security")
135
  set(_warn "${_warn} -Wframe-larger-than=65536")
136
  set(_warn "${_warn} -Wmissing-format-attribute")
137
  set(_warn "${_warn} -Wnon-virtual-dtor")
138
  set(_warn "${_warn} -Woverloaded-virtual")
139
  set(_warn "${_warn} -Wmissing-declarations")
140
  set(_warn "${_warn} -Wundef")
141
  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
142
  set(_warn "${_warn} -Wshadow")
143
  set(_warn "${_warn} -Wweak-vtables")
144
145
  # set extra warnings
146
  set(_warnx "${_warnx} -Wconversion")
147
148
  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
149
  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
150
151
  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
152
  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
153
  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
154
  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
155
  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
156
  set(CMAKE_CXX_FLAGS_DEBUG          "-g ${_save_cxxflags}")
157
  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
158
  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
159
  set(_save_cflags "${CMAKE_C_FLAGS}")
160
  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
161
  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
162
  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
163
  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
164
  set(CMAKE_C_FLAGS_DEBUG            "-g ${_save_cflags}")
165
  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
166
  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
167
168
endif()
169
170
if(CMAKE_C_COMPILER MATCHES "icc")
171
  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
172
  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
173
  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
174
  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign ${_save_cxxflags}")
175
  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign ${_save_cxxflags}")
176
  set(_save_cflags "${CMAKE_C_FLAGS}")
177
  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
178
  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
179
  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign ${_save_cflags}")
180
  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign ${_save_cflags}")
181
endif(CMAKE_C_COMPILER MATCHES "icc")
182
183
- 

Return to bug 782721