comment out crypto stuff, for now (only compiles on windows)

This commit is contained in:
Nick Bolton 2013-01-05 22:50:34 +00:00
parent a11b68c988
commit c8ea071d78
2 changed files with 10 additions and 10 deletions

View File

@ -28,7 +28,7 @@ set(src
synergy/CClipboardTests.cpp synergy/CClipboardTests.cpp
synergy/CKeyStateTests.cpp synergy/CKeyStateTests.cpp
client/CServerProxyTests.cpp client/CServerProxyTests.cpp
synergy/CCryptoTests.cpp # synergy/CCryptoTests.cpp
) )
set(inc set(inc
@ -43,7 +43,7 @@ set(inc
../../lib/synergy ../../lib/synergy
../../../tools/gtest-1.6.0/include ../../../tools/gtest-1.6.0/include
../../../tools/gmock-1.6.0/include ../../../tools/gmock-1.6.0/include
../../../tools/cryptopp561 # ../../../tools/cryptopp561
io io
synergy synergy
) )
@ -63,4 +63,4 @@ endif()
include_directories(${inc}) include_directories(${inc})
add_executable(unittests ${src}) add_executable(unittests ${src})
target_link_libraries(unittests target_link_libraries(unittests
arch base client common io net platform server synergy mt gtest gmock cryptopp ${libs}) arch base client common io net platform server synergy mt gtest gmock ${libs})

View File

@ -14,13 +14,13 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
set(cpp_dir cryptopp561) #set(cpp_dir cryptopp561)
file(GLOB cpp_src ${cpp_dir}/*.cpp) #file(GLOB cpp_src ${cpp_dir}/*.cpp)
if (WIN32) #if (WIN32)
file(GLOB cpp_hdr ${cpp_dir}/*.h) # file(GLOB cpp_hdr ${cpp_dir}/*.h)
list(APPEND cpp_src ${cpp_hdr}) # list(APPEND cpp_src ${cpp_hdr})
endif() #endif()
add_library(cryptopp STATIC ${cpp_src}) #add_library(cryptopp STATIC ${cpp_src})