From f1e502c8f55ddd689de4f3bd4d31f77e93c0cf29 Mon Sep 17 00:00:00 2001 From: Pavel Krajcevski Date: Sat, 26 Jan 2013 18:03:48 -0500 Subject: [PATCH] Remove hack for adding a libpath flag in visual studio by requiring extra libraries from boost. --- CLTool/CMakeLists.txt | 6 +++--- Core/CMakeLists.txt | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CLTool/CMakeLists.txt b/CLTool/CMakeLists.txt index 223d39b..2d2145c 100644 --- a/CLTool/CMakeLists.txt +++ b/CLTool/CMakeLists.txt @@ -15,9 +15,9 @@ ADD_EXECUTABLE( # Make sure that if we're using boost libraries for threading then we add this linker path. # Personally, I believe this is a bug in CMAKE but I'm not exactly sure. -IF( THREAD_API MATCHES "Boost" ) - SET_TARGET_PROPERTIES(tc PROPERTIES LINK_FLAGS "/LIBPATH:\"${Boost_LIBRARY_DIRS}\"") -ENDIF() +#IF( THREAD_API MATCHES "Boost" ) +# SET_TARGET_PROPERTIES(tc PROPERTIES LINK_FLAGS "/LIBPATH:\"${Boost_LIBRARY_DIRS}\"") +#ENDIF() TARGET_LINK_LIBRARIES( tc BPTCEncoder ) TARGET_LINK_LIBRARIES( tc TexCompIO ) diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt index a585901..54f0bbe 100644 --- a/Core/CMakeLists.txt +++ b/Core/CMakeLists.txt @@ -39,7 +39,8 @@ INCLUDE_DIRECTORIES( ${TexC_SOURCE_DIR}/Core/include ) SET( THREAD_API ) SET( THREAD_APIS_AVAILABLE "None" ) -FIND_PACKAGE( Boost COMPONENTS thread system ) +SET( Boost_USE_STATIC_LIBS ON ) +FIND_PACKAGE( Boost COMPONENTS thread system date_time chrono ) IF( Boost_FOUND ) SET( THREAD_APIS_AVAILABLE "Boost" ${THREAD_APIS_AVAILABLE} )