simplify mast Cmake file

zhouyan · Jun 23, 2012 · 3d28125 · 3d28125
1 parent 86e50a1
commit 3d28125
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 43 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,49 +16,6 @@ SET (VERSION_PATCH 0)
 SET (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
 
 # Finding Packages
-IF (WIN32)
-    IF (NOT BOOST_ROOT)
-        SET (BOOST_ROOT "C:/Program Files/Boost")
-    ENDIF (NOT BOOST_ROOT)
-
-    IF (NOT Eigen_INC_PATH)
-        SET (Eigen_INC_PATH "C:/Program Files/Eigen")
-    ENDIF (NOT Eigen_INC_PATH)
-
-    IF (NOT Random123_INC_PATH)
-        SET (Random123_INC_PATH "C:/Program Files/Random123/include")
-    ENDIF (NOT Random123_INC_PATH)
-
-    IF (MSVC)
-        IF ($ENV{TBBROOT})
-            FILE (TO_CMAKE_PATH $ENV{TBBROOT} TBB_ROOT)
-        ELSE ($ENV{TBBROOT})
-            SET (TBB_ROOT "C:/Program Files/TBB")
-        ENDIF ($ENV{TBBROOT})
-
-        IF (NOT TBB_INC_PATH)
-            SET (TBB_INC_PATH "${TBB_ROOT}/include")
-        ENDIF (NOT TBB_INC_PATH)
-
-        IF (NOT TBB_LIB_PATH)
-            IF (CMAKE_CL_64)
-                SET (TBB_MSVC_LIB "intel64")
-            ELSE (CMAKE_CL_64)
-                SET (TBB_MSVC_LIB "ia32")
-            ENDIF (CMAKE_CL_64)
-            IF (MSVC_VERSION GREATER 1599)
-                SET (TBB_MSVC_LIB "${TBB_MSVC_LIB}/vc10")
-            ELSEIF (MSVC_VERSION GREATER 1499)
-                SET (TBB_MSVC_LIB "${TBB_MSVC_LIB}/vc9")
-            ELSEIF (MSVC_VERSION GREATER 1399)
-                SET (TBB_MSVC_LIB "${TBB_MSVC_LIB}/vc8")
-            ENDIF (MSVC_VERSION GREATER 1599)
-            SET (TBB_LIB_PATH "${TBB_ROOT}/lib/${TBB_MSVC_LIB}")
-            SET (TBB_DLL_PATH "${TBB_ROOT}/bin/${TBB_MSVC_LIB}")
-        ENDIF (NOT TBB_LIB_PATH)
-    ENDIF (MSVC)
-ENDIF (WIN32)
-
 SET (Boost_NO_BOOST_CMAKE     ON)
 SET (Boost_USE_STATIC_LIBS    ON)
 SET (Boost_USE_MULTITHREADED  ON)

diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
@@ -1,6 +1,24 @@
 SET (TBB_FOUND TRUE)
 
 IF (NOT TBB_LINK_LIBRARIES)
+    IF (MSVC)
+        IF (NOT TBB_LIB_PATH)
+            IF (CMAKE_CL_64)
+                SET (TBB_MSVC_LIB "intel64")
+            ELSE (CMAKE_CL_64)
+                SET (TBB_MSVC_LIB "ia32")
+            ENDIF (CMAKE_CL_64)
+            IF (MSVC_VERSION GREATER 1599)
+                SET (TBB_MSVC_LIB "${TBB_MSVC_LIB}/vc10")
+            ELSEIF (MSVC_VERSION GREATER 1499)
+                SET (TBB_MSVC_LIB "${TBB_MSVC_LIB}/vc9")
+            ELSEIF (MSVC_VERSION GREATER 1399)
+                SET (TBB_MSVC_LIB "${TBB_MSVC_LIB}/vc8")
+            ENDIF (MSVC_VERSION GREATER 1599)
+            SET (TBB_LIB_PATH "${TBB_ROOT}/lib/${TBB_MSVC_LIB}")
+            SET (TBB_DLL_PATH "${TBB_ROOT}/bin/${TBB_MSVC_LIB}")
+        ENDIF (NOT TBB_LIB_PATH)
+    ENDIF (MSVC)
     SET (TBB_LIB_PATH ${TBB_LIB_PATH} $ENV{TBBROOT}/lib)
     SET (TBB_LIB_PATH ${TBB_LIB_PATH} $ENV{TBBROOT}/lib/intel64)
     SET (TBB_LIB_PATH ${TBB_LIB_PATH} $ENV{TBBROOT}/lib/ia32)
@@ -19,6 +37,11 @@ ELSE (TBB_LINK_LIBRARIES)
 ENDIF (TBB_LINK_LIBRARIES)
 
 IF (NOT TBB_INCLUDE_DIR)
+    IF (MSVC)
+        IF (NOT TBB_INC_PATH)
+            SET (TBB_INC_PATH "${TBB_ROOT}/include")
+        ENDIF (NOT TBB_INC_PATH)
+    ENDIF(MSVC)
     SET (TBB_INC_PATH ${TBB_INC_PATH} $ENV{TBBROOT}/include)
     FIND_PATH (TBB_INCLUDE_DIR tbb/tbb.h PATHS ${TBB_INC_PATH} ENV CPATH)
 ENDIF (NOT TBB_INCLUDE_DIR)