Changeset 371 for code/branches/FICN

Timestamp:

Dec 3, 2007, 3:44:30 PM (17 years ago)

Author:

nicolasc

Message:

fixed FindBoost.cmake

Location:

code/branches/FICN

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/FindBoost.cmake (modified) (3 diffs)
• src/network/CMakeLists.txt (modified) (1 diff)

code/branches/FICN/CMakeLists.txt

@@ -39 +39 @@
     SET(CMAKE_CXX_COMPILER "g++-4.1.1")
     # reset eNet serach path
-    SET(Boost_INCLUDE_DIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include/")
+    SET(Boost_INCLUDE_DIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include/boost-1_34_1")
   ENDIF(IS_TARDIS)
 

code/branches/FICN/cmake/FindBoost.cmake

@@ +1 @@
+# THIS FILE HAS BEEN MODIFIED TO WORK ON TARDIS
+# use with cation
+# Nicolas Schlumberger <nico AT orxonx DOT net> (C) 2007
+#
 # - Find the Boost includes and libraries.
 # The following variables are set if Boost is found.  If Boost is not
@@ -163 +167 @@
 # List of library suffixes to search, e.g. libboost_date_time-gcc
 SET(BOOST_SUFFIX_SEARCH
+  gcc41-mt
   gcc
   il
@@ -174 +179 @@
   iostreams
   program_options
-  python
   regex
   serialization

code/branches/FICN/src/network/CMakeLists.txt

@@ -13 +13 @@
 )
 
-ADD_LIBRARY(network ${NETWORK_SRC_FILES} ${ENet_LABRARY})
-TARGET_LINK_LIBRARIES(network ${ENet_LIBRARY})
+ADD_LIBRARY(network SHARED ${NETWORK_SRC_FILES} ${ENet_LIBRARY} ${Boost_LIBRARIES})
+TARGET_LINK_LIBRARIES(network ${ENet_LIBRARY} ${Boost_LIBRARIES})