Add options for following modules:

[casparcg] / core / CMakeLists.txt

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 21ef8a9bdef15a137c68de1968d2efff4c524801..08056ace105f40877f77d51f13bb1bb63e771c1b 100644 (file)
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -144,12 +144,12 @@ add_library(core ${SOURCES} ${HEADERS})
 add_precompiled_header(core StdAfx.h FORCEINCLUDE)
 
 include_directories(..)
-include_directories(${BOOST_INCLUDE_PATH})
-include_directories(${RXCPP_INCLUDE_PATH})
-include_directories(${TBB_INCLUDE_PATH})
-include_directories(${SFML_INCLUDE_PATH})
-include_directories(${FREETYPE_INCLUDE_PATH})
-include_directories(${GLEW_INCLUDE_PATH})
+include_directories(${Boost_INCLUDE_DIRS})
+include_directories(${RXCPP_INCLUDE_DIRS})
+include_directories(${TBB_INCLUDE_DIRS})
+include_directories(${SFML_INCLUDE_DIR})
+include_directories(${FREETYPE_INCLUDE_DIRS})
+include_directories(${GLEW_INCLUDE_DIRS})
 
 source_group(sources ./*)
 source_group(sources\\consumer consumer/*)
@@ -171,16 +171,8 @@ source_group(sources\\producer\\text producer/text/*)
 source_group(sources\\producer\\transition producer/transition/*)
 source_group(sources\\producer\\separated producer/separated/*)
 
-if (MSVC)
-       target_link_libraries(core
-                       common
+target_link_libraries(core
+       common
 
-                       freetype.lib
-       )
-else()
-       target_link_libraries(core
-                       common
-
-                       freetype
-       )
-endif()
+       "${FREETYPE_LIBRARIES}"
+)