buildsystem fixes

renefritze · Jul 29, 2012 · 53031c4 · 53031c4
1 parent f861b19
commit 53031c4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,6 +37,11 @@ INCLUDE(cmake/sources_list.cmake)
 
 FIND_PACKAGE( PkgConfig )
 
+set(Boost_USE_MULTITHREADED      ON)
+if( ${CMAKE_CROSSCOMPILING} )
+	set(Boost_USE_STATIC_LIBS       ON)
+	set(Boost_USE_STATIC_RUNTIME    ON)
+endif()
 FIND_PACKAGE(Boost 1.40.0 COMPONENTS system thread filesystem  REQUIRED)
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_custom_target(doc)
+if( NOT TARGET doc )
+	add_custom_target( doc )
+endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH})
 set(DOXYFILE_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doxygen" )
@@ -23,6 +25,5 @@ if( EXISTS ${XSLTPROC} )
 		${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/protocol/index.xsl 
 		${CMAKE_CURRENT_SOURCE_DIR}/protocol/ProtocolDescription.xml  > ${CMAKE_CURRENT_BINARY_DIR}/index.html 
 		)
-	target_exists( doc doc_exists )
 	add_dependencies( doc protocol )
 endif( EXISTS ${XSLTPROC} )
diff --git a/src/lsl/CMakeLists.txt b/src/lsl/CMakeLists.txt
@@ -28,7 +28,7 @@ LIST( APPEND libSpringLobbyHeader ${templatesources} )
 set_source_files_properties(  ${libSpringLobbyHeader} PROPERTIES HEADER_FILE_ONLY 1 )
 
 ADD_LIBRARY(libSpringLobby STATIC ${libSpringLobbyHeader} ${libSpringLobbySrc} ${libSpringLobby_RC_FILE} )
-TARGET_LINK_LIBRARIES(libSpringLobby  libSpringLobbyUtils boost_system boost_filesystem boost_thread )
+TARGET_LINK_LIBRARIES(libSpringLobby  libSpringLobbyUtils boost_system-mt boost_filesystem-mt boost_thread-mt )
 
 IF(MINGW)
 	TARGET_LINK_LIBRARIES( libSpringLobby iphlpapi )

diff --git a/src/lslutils/CMakeLists.txt b/src/lslutils/CMakeLists.txt
@@ -17,6 +17,7 @@ SET( templatesources
 )
 LIST( APPEND libSpringLobbyUtilsHeader ${templatesources} )
 set_source_files_properties(  ${libSpringLobbyUtilsHeader} PROPERTIES HEADER_FILE_ONLY 1 )
-
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 ADD_LIBRARY(libSpringLobbyUtils STATIC ${libSpringLobbyHeader} ${libSpringLobbyUtilsSrc} )
-TARGET_LINK_LIBRARIES(libSpringLobbyUtils )
+TARGET_LINK_LIBRARIES(libSpringLobbyUtils boost_thread-mt)
diff --git a/src/unitsync++/CMakeLists.txt b/src/unitsync++/CMakeLists.txt
@@ -16,7 +16,7 @@ LIST( APPEND libUnitsyncHeader ${templatesources} )
 set_source_files_properties(  ${libUnitsyncHeader} PROPERTIES HEADER_FILE_ONLY 1 )
 
 ADD_LIBRARY(libUnitsync++ STATIC ${libUnitsyncHeader} ${libUnitsyncSrc} )
-TARGET_LINK_LIBRARIES(libUnitsync++ dl boost_filesystem boost_thread )
+TARGET_LINK_LIBRARIES(libUnitsync++ dl boost_filesystem-mt boost_thread-mt )
 
 #cimage deps
 FIND_PACKAGE( PNG REQUIRED)

diff --git a/test/commands.h b/test/commands.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <sstream>
 #include <assert.h>
-
+#include <iostream>
 #include <lsl/networking/commands.h>
 
 struct ServerEvents {