Changeset 41 for code/branches/tutorial

Timestamp:

Oct 11, 2007, 5:37:25 PM (17 years ago)

Author:

nicolasc

Message:

bump

Location:

code/branches/tutorial/Tutorial

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/FindOGRE.cmake (modified) (1 diff)
• cmake/FindOIS.cmake (modified) (1 diff)

code/branches/tutorial/Tutorial/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(Tutorial)
 
-SET(CMAKE_C_COMPILER CC="gcc-3.4 gcc-4.1.2 gcc" CXX="g++-3.4 g++-4.1.2 g++")
+SET(CMAKE_CXX_COMPILER CC="gcc-3.4.3 gcc-4.1.2 gcc" CXX="g++-3.4.3 g++-4.1.2 g++")
 
 SET(SRC_FILES src/main.cpp)

code/branches/tutorial/Tutorial/cmake/FindOGRE.cmake

@@ -24 +24 @@
 ELSE (WIN32) #Unix
     FIND_PACKAGE(PkgConfig)
-    PKG_SEARCH_MODULE(OGRE OGRE /usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/pkgconfig) # tardis specific hack
+    PKG_SEARCH_MODULE(OGRE OGRE /usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/pkgconfig/OGRE.pc) # tardis specific hack
     SET(OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIRS})
     SET(OGRE_LIB_DIR ${OGRE_LIBDIR})

code/branches/tutorial/Tutorial/cmake/FindOIS.cmake

@@ -25 +25 @@
 ELSE (WIN32) #Unix
     FIND_PACKAGE(PkgConfig)
-    PKG_SEARCH_MODULE(OIS OIS /usr/pack/ois-1.0-sd/i686-debian-linux3.1/lib/pkgconfig/) # tardis specific hack
+    PKG_SEARCH_MODULE(OIS OIS /usr/pack/ois-1.0-sd/i686-debian-linux3.1/lib/pkgconfig/OIS.pc) # tardis specific hack
     SET(OIS_INCLUDE_DIR ${OIS_INCLUDE_DIRS})
     SET(OIS_LIB_DIR ${OIS_LIBDIR})