Add in a small hack to add the boost library directory to the linker command line in order to be able to compile.

This commit is contained in:
Pavel Krajcevski 2013-01-26 14:12:19 -05:00
parent 42c350878e
commit 37d8cc797c
2 changed files with 28 additions and 0 deletions

View File

@ -13,6 +13,12 @@ ADD_EXECUTABLE(
${SOURCES} ${SOURCES}
) )
# 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()
TARGET_LINK_LIBRARIES( tc BPTCEncoder ) TARGET_LINK_LIBRARIES( tc BPTCEncoder )
TARGET_LINK_LIBRARIES( tc TexCompIO ) TARGET_LINK_LIBRARIES( tc TexCompIO )
TARGET_LINK_LIBRARIES( tc TexCompCore ) TARGET_LINK_LIBRARIES( tc TexCompCore )

View File

@ -1,6 +1,28 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR) CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
PROJECT(TexC) PROJECT(TexC)
IF(MSVC)
SET(MSVC_INSTALL_PATH "${PROJECT_SOURCE_DIR}/Windows")
SET(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};${MSVC_INSTALL_PATH}")
IF(MSVC10)
SET(MSVC_VERSION_STRING vc100)
ELSEIF(MSVC11)
SET(MSVC_VERSION_STRING vc110)
ELSEIF(MSVC90)
SET(MSVC_VERSION_STRING vc90)
ELSEIF(MSVC80)
SET(MSVC_VERSION_STRING vc80)
ENDIF()
# !FIXME! Actually detect compiler architecture version....
SET(MSVC_ARCHITECTURE_STRING x64)
SET(MSVC_LIB_DIR "${MSVC_INSTALL_PATH}/lib/${MSVC_ARCHITECTURE_STRING}/${MSVC_VERSION_STRING}")
SET(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH};${MSVC_LIB_DIR}")
ENDIF(MSVC)
ADD_SUBDIRECTORY(BPTCEncoder) ADD_SUBDIRECTORY(BPTCEncoder)
ADD_SUBDIRECTORY(IO) ADD_SUBDIRECTORY(IO)
ADD_SUBDIRECTORY(Core) ADD_SUBDIRECTORY(Core)