[Scstudio-commits] SF.net SVN: scstudio:[1567] trunk

[<xr...@us...>]

Revision: 1567
          http://scstudio.svn.sourceforge.net/scstudio/?rev=1567&view=rev
Author:   xrehak
Date:     2013-02-09 18:48:37 +0000 (Sat, 09 Feb 2013)
Log Message:
-----------
Fix of commit 1565

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/third-party-sw/boost/CMakeLists.txt

Property Changed:
----------------
    trunk/CHANGELOG
    trunk/CMakeLists.txt
    trunk/COPYING
    trunk/CTestConfig.cmake
    trunk/third-party-sw/boost/CMakeLists.txt


Property changes on: trunk/CHANGELOG
___________________________________________________________________
Modified: svn:keywords
   - Date
Revision
   + Date Revision Author HeadURL Id

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2013-02-09 17:59:01 UTC (rev 1566)
+++ trunk/CMakeLists.txt	2013-02-09 18:48:37 UTC (rev 1567)
@@ -63,9 +63,11 @@
 ENDIF(WIN32)
 
 SET(Boost_USE_MULTITHREADED ON)
+SET(Boost_NO_SYSTEM_PATHS TRUE)
 
 execute_process(COMMAND cmake .
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/third-party-sw/boost/)
+#     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/third-party-sw/boost/)
+     WORKING_DIRECTORY ${BOOST_ROOT})
 
   FIND_PACKAGE(Boost COMPONENTS date_time thread serialization system chrono REQUIRED)
 


Property changes on: trunk/CMakeLists.txt
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Date Revision Author HeadURL Id


Property changes on: trunk/COPYING
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author HeadURL Id


Property changes on: trunk/CTestConfig.cmake
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Date Revision Author HeadURL Id

Modified: trunk/third-party-sw/boost/CMakeLists.txt
===================================================================
--- trunk/third-party-sw/boost/CMakeLists.txt	2013-02-09 17:59:01 UTC (rev 1566)
+++ trunk/third-party-sw/boost/CMakeLists.txt	2013-02-09 18:48:37 UTC (rev 1567)
@@ -1,25 +1,27 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
-SET(BOOST_ROOT "${CMAKE_SOURCE_DIR}" CACHE PATH "The BOOST directory root.")
-
-FIND_PACKAGE(Boost COMPONENTS date_time thread serialization system)
-
-IF(NOT Boost_FOUND)
-  MESSAGE("Compiling boost")
-  IF(WIN32)
-    execute_process(COMMAND bootstrap.bat
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-    execute_process(COMMAND ./b2 --with-date_time --with-thread --with-serialization --with-system --with-chrono
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-  ELSE(WIN32)
-    execute_process(COMMAND chmod u+x ./tools/build/v2/engine/build.sh
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-    execute_process(COMMAND chmod u+x ./bootstrap.sh
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-    execute_process(COMMAND ./bootstrap.sh
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-    execute_process(COMMAND ./b2 --with-date_time --with-thread --with-serialization --with-system --with-chrono
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-  ENDIF(WIN32)
-  MESSAGE("Compiling boost done")
-ENDIF(NOT Boost_FOUND)
\ No newline at end of file
+# $Id$
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+SET(BOOST_ROOT "${CMAKE_SOURCE_DIR}" CACHE PATH "The BOOST directory root.")
+
+FIND_PACKAGE(Boost COMPONENTS date_time thread serialization system chrono)
+
+IF(NOT Boost_FOUND)
+  MESSAGE("Compiling boost")
+  IF(WIN32)
+    execute_process(COMMAND bootstrap.bat
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+    execute_process(COMMAND ./b2 --with-date_time --with-thread --with-serialization --with-system --with-chrono
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+  ELSE(WIN32)
+    execute_process(COMMAND chmod u+x ./tools/build/v2/engine/build.sh
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+    execute_process(COMMAND chmod u+x ./bootstrap.sh
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+    execute_process(COMMAND ./bootstrap.sh
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+    execute_process(COMMAND ./b2 --with-date_time --with-thread --with-serialization --with-system --with-chrono
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+  ENDIF(WIN32)
+  MESSAGE("Compiling boost done")
+ENDIF(NOT Boost_FOUND)


Property changes on: trunk/third-party-sw/boost/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author HeadURL Id
Added: svn:eol-style
   + native

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.