[Supertuxkart-commit] SF.net SVN: supertuxkart:[11197] main/trunk/CMakeLists.txt

[<und...@us...>]

Revision: 11197
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=11197&view=rev
Author:   undef-in-ed
Date:     2012-05-07 17:40:18 +0000 (Mon, 07 May 2012)
Log Message:
-----------
Bugfix: Overwriting PATH breaks gcc toolchain on some systems

This has been the reason for the IRRLICHT_WITH_XF86VM and
IRRLICHT_WITHOUT_XF86VM failures on some Linux machines.

Modified Paths:
--------------
    main/trunk/CMakeLists.txt

Modified: main/trunk/CMakeLists.txt
===================================================================
--- main/trunk/CMakeLists.txt	2012-05-07 02:03:03 UTC (rev 11196)
+++ main/trunk/CMakeLists.txt	2012-05-07 17:40:18 UTC (rev 11197)
@@ -41,10 +41,12 @@
 # Set include paths
 include_directories(${STK_SOURCE_DIR})
 
-# With these variables set libraries in "dependencies" are found
-set(ENV{PATH} ${PROJECT_SOURCE_DIR}/dependencies/include)
-set(ENV{LIB} ${PROJECT_SOURCE_DIR}/dependencies/lib)
-set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/dependencies)
+# These variables enable MSVC to find libraries located in "dependencies"
+if(MSVC)
+    set(ENV{PATH} ${PROJECT_SOURCE_DIR}/dependencies/include)
+    set(ENV{LIB} ${PROJECT_SOURCE_DIR}/dependencies/lib)
+    set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/dependencies)
+endif()
 
 # Irrlicht
 find_package(Irrlicht 1.8 REQUIRED)

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