Merge pull request #397 from dimitry-ishenko-casparcg/2.1.0-fixes

[casparcg] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2861c8f5e98553fcd358ca1d17094529bb68ee9..d518a4ccd7e9f61db9fb7606e81b09b211e803ff 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@ set(FREEIMAGE_INCLUDE_PATH            "${DEPENDENCIES_FOLDER}/freeimage/include")
 set(OPENAL_INCLUDE_PATH                        "${DEPENDENCIES_FOLDER}/openal/include")
 set(BLUEFISH_INCLUDE_PATH              "${DEPENDENCIES_FOLDER}/bluefish/include")
 set(CEF_INCLUDE_PATH                   "${DEPENDENCIES_FOLDER}/cef/include")
+set(GTEST_INCLUDE_PATH                 "${DEPENDENCIES_FOLDER}/gtest/include")
 
 if (MSVC)
        set(PLATFORM_FOLDER_NAME        "win32")
@@ -62,6 +63,7 @@ link_directories("${DEPENDENCIES_FOLDER}/openal/lib/${PLATFORM_FOLDER_NAME}")
 link_directories("${DEPENDENCIES_FOLDER}/bluefish/lib")
 link_directories("${DEPENDENCIES_FOLDER}/zlib/lib")
 link_directories("${DEPENDENCIES_FOLDER}/cef/lib/${PLATFORM_FOLDER_NAME}")
+link_directories("${DEPENDENCIES_FOLDER}/gtest/lib/${PLATFORM_FOLDER_NAME}")
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -154,3 +156,4 @@ add_subdirectory(modules)
 
 add_subdirectory(protocol)
 add_subdirectory(shell)
+add_subdirectory(unit-test)