[simspark-svn] SF.net SVN: simspark:[410] trunk/rcssserver3d/cmake

[<he...@us...>]

Revision: 410
          http://sourceforge.net/p/simspark/svn/410
Author:   hedayat
Date:     2016-06-04 14:25:52 +0000 (Sat, 04 Jun 2016)
Log Message:
-----------
SPARK_DIR/CARBON_DIR environment variables take precedence over system default search paths

Modified Paths:
--------------
    trunk/rcssserver3d/cmake/FindCarbon.cmake
    trunk/rcssserver3d/cmake/FindSpark.cmake

Modified: trunk/rcssserver3d/cmake/FindCarbon.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindCarbon.cmake	2016-06-02 11:31:53 UTC (rev 409)
+++ trunk/rcssserver3d/cmake/FindCarbon.cmake	2016-06-04 14:25:52 UTC (rev 410)
@@ -14,21 +14,25 @@
   SET(CARBON_FIND_QUIETLY TRUE)
 ENDIF (CARBON_INCLUDE_DIR)
 
-SET(CARBON_DIR $ENV{CARBON_DIR} "C:/Program Files/simspark" "C:/Program Files (x86)/simspark" "C:/library/simspark")
+SET(CARBON_DIR "C:/Program Files/simspark" "C:/Program Files (x86)/simspark" "C:/library/simspark")
 
 FIND_PATH(CARBON_INCLUDE_DIR carbon/carbon.h
+  HINTS ENV CARBON_DIR
   PATHS ${CARBON_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 FIND_PATH(CARBON_ROOT_DIR share/carbon/setups/DefaultSetupGrid.xml
+  HINTS ENV CARBON_DIR
   PATHS ${CARBON_DIR})  
   
 FIND_PATH(CARBON_DATA_DIR setups/DefaultSetupGrid.xml
+  HINTS ENV CARBON_DIR
   PATHS ${CARBON_DIR}
   PATH_SUFFIXES share/carbon)
   
 SET(CARBON_NAMES carbon carbon_debug)
 FIND_LIBRARY(CARBON_LIBRARY NAMES ${CARBON_NAMES}
+  HINTS ENV CARBON_DIR
   PATHS ${CARBON_DIR}
   PATH_SUFFIXES simspark lib/simspark)
     

Modified: trunk/rcssserver3d/cmake/FindSpark.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindSpark.cmake	2016-06-02 11:31:53 UTC (rev 409)
+++ trunk/rcssserver3d/cmake/FindSpark.cmake	2016-06-04 14:25:52 UTC (rev 410)
@@ -41,14 +41,16 @@
   SET(SPARK_FIND_QUIETLY TRUE)
 ENDIF (SPARK_INCLUDE_DIR)
 
-SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Program Files (x86)/simspark" "C:/library/simspark")
+SET(SPARK_DIR "C:/Program Files/simspark" "C:/Program Files (x86)/simspark" "C:/library/simspark")
 
 FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h
+  HINTS ENV SPARK_DIR
   PATHS ${SPARK_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 SET(SPARK_NAMES spark spark_debug)
 FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES}
+  HINTS ENV SPARK_DIR
   PATHS ${SPARK_DIR}
   PATH_SUFFIXES simspark lib/simspark)
 GET_FILENAME_COMPONENT(SPARK_LIB_DIR ${SPARK_LIBRARY} PATH)
@@ -76,11 +78,13 @@
 ENDIF (SALT_INCLUDE_DIR)
 
 FIND_PATH(SALT_INCLUDE_DIR salt/salt.h
+  HINTS ENV SPARK_DIR
   PATHS ${SPARK_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 SET(SALT_NAMES salt salt_debug)
 FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES}
+  HINTS ENV SPARK_DIR
   PATHS ${SPARK_DIR}
   PATH_SUFFIXES simspark lib/simspark)
 
@@ -107,11 +111,13 @@
 ENDIF (ZEITGEIST_INCLUDE_DIR)
 
 FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h
+  HINTS ENV SPARK_DIR
   PATHS ${SPARK_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 SET(ZEITGEIST_NAMES zeitgeist zeitgeist_debug)
 FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES}
+  HINTS ENV SPARK_DIR
   PATHS ${SPARK_DIR}
   PATH_SUFFIXES simspark lib/simspark)
 
@@ -138,11 +144,13 @@
 ENDIF (OXYGEN_INCLUDE_DIR)
 
 FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h
+  HINTS ENV SPARK_DIR
   PATHS ${SPARK_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 SET(OXYGEN_NAMES oxygen oxygen_debug)
 FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES}
+  HINTS ENV SPARK_DIR
   PATHS ${SPARK_DIR}
   PATH_SUFFIXES simspark lib/simspark)
 
@@ -169,11 +177,13 @@
 ENDIF (KEROSIN_INCLUDE_DIR)
 
 FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h
+  HINTS ENV SPARK_DIR
   PATHS ${SPARK_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 SET(KEROSIN_NAMES kerosin kerosin_debug)
 FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES}
+  HINTS ENV SPARK_DIR
   PATHS ${SPARK_DIR}
   PATH_SUFFIXES simspark lib/simspark)
 
@@ -200,11 +210,13 @@
 ENDIF (RCSSNET3D_INCLUDE_DIR)
 
 FIND_PATH(RCSSNET3D_INCLUDE_DIR rcssnet/addr.hpp
+  HINTS ENV SPARK_DIR
   PATHS ${SPARK_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 SET(RCSSNET3D_NAMES rcssnet3D rcssnet3D_debug)
 FIND_LIBRARY(RCSSNET3D_LIBRARY NAMES ${RCSSNET3D_NAMES}
+  HINTS ENV SPARK_DIR
   PATHS ${SPARK_DIR}
   PATH_SUFFIXES simspark lib/simspark)
 

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