Merge remote-tracking branch 'cgogn/develop' into develop

74ca83b1 · Pierre Kraemer · 82c83351 · 679b508c · 74ca83b1 · 74ca83b1
Commit 74ca83b1 authored Jan 26, 2015 by Pierre Kraemer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

CMakeLists.txt CMakeLists.txt +1 -1

ThirdParty/CMakeLists.txt ThirdParty/CMakeLists.txt +1 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
 cmake_minimum_required(VERSION 2.8)

 project(CGoGN)
-cmake_policy(SET CMP0042 NEW) # rpath new policy
+#cmake_policy(SET CMP0042 NEW) # rpath new policy

 #SET ( CMAKE_VERBOSE_MAKEFILE 1 )


--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
 cmake_minimum_required(VERSION 2.8)

 project(CGoGN_ThirdParty)
-cmake_policy(SET CMP0042 NEW) # rpath new policy
+#cmake_policy(SET CMP0042 NEW) # rpath new policy

 SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/..)