22 lines
1008 B
Diff
22 lines
1008 B
Diff
|
diff -up ./CMakeLists.txt.cmakedir ./CMakeLists.txt
|
||
|
--- ./CMakeLists.txt.cmakedir 2015-10-11 16:57:44.000000000 -0400
|
||
|
+++ ./CMakeLists.txt 2016-02-14 11:01:38.328344701 -0500
|
||
|
@@ -632,7 +632,7 @@ endif (MSVC)
|
||
|
if (UNIX)
|
||
|
# GCC is not strict enough by default, so enable most of the warnings.
|
||
|
set(CMAKE_CXX_FLAGS
|
||
|
- "${CMAKE_CXX_FLAGS} -Werror=all -Werror=extra -Wno-unknown-pragmas -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers")
|
||
|
+ "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers")
|
||
|
endif (UNIX)
|
||
|
|
||
|
# Use a larger inlining threshold for Clang, since it hobbles Eigen,
|
||
|
@@ -762,7 +762,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmak
|
||
|
if (WIN32)
|
||
|
set(RELATIVE_CMAKECONFIG_INSTALL_DIR CMake)
|
||
|
else ()
|
||
|
- set(RELATIVE_CMAKECONFIG_INSTALL_DIR share/Ceres)
|
||
|
+ set(RELATIVE_CMAKECONFIG_INSTALL_DIR lib${LIB_SUFFIX}/cmake/Ceres)
|
||
|
endif ()
|
||
|
|
||
|
# This "exports" for installation all targets which have been put into the
|