Merge branch 'remove-double-include' of https://git01.codeplex.com/forks/locutusofborg/casablanca2 into misc_cmake_pull_requests

stgates · stgates · commit 2df06748909c · 2015-06-03T14:52:42.000-07:00
diff --git a/Release/include/cpprest/details/basic_types.h b/Release/include/cpprest/details/basic_types.h
@@ -30,7 +30,6 @@
 #include <iostream>
 #include <sstream>
 #include "cpprest/details/cpprest_compat.h"
-#include "cpprest/details/basic_types.h"
 
 #ifndef _WIN32
 # define __STDC_LIMIT_MACROS
diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(../include pch ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
+include_directories(pch ${OPENSSL_INCLUDE_DIR})
 
 set(SOURCES_COMMON
   http/client/http_client_msg.cpp
diff --git a/Release/tests/common/TestRunner/CMakeLists.txt b/Release/tests/common/TestRunner/CMakeLists.txt
@@ -1,7 +1,4 @@
-include_directories(${Casablanca_INCLUDE_DIR}
-  ../UnitTestpp
-  ${Boost_INCLUDE_DIR}
-  )
+include_directories(${Casablanca_INCLUDE_DIRS})
 
 set(TR_SOURCES
   test_runner.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-include_directories(../include pch ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})`
	`1`	`+include_directories(pch ${OPENSSL_INCLUDE_DIR})`
`2`	`2`
`3`	`3`	`set(SOURCES_COMMON`
`4`	`4`	`http/client/http_client_msg.cpp`