From 0059a060add61a4328953bad6408975547e03cfa Mon Sep 17 00:00:00 2001 From: Mathis Rosenhauer Date: Fri, 25 Jul 2014 12:00:44 +0200 Subject: [PATCH] Windows install fixes. --- CMakeLists.txt | 7 ++----- src/CMakeLists.txt | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a914e9..dc017a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,5 @@ INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}/src") INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/src") ADD_SUBDIRECTORY(src) -IF(WIN32) - ADD_SUBDIRECTORY(tests) -ELSE(WIN32) - ADD_SUBDIRECTORY(tests EXCLUDE_FROM_ALL) -ENDIF(WIN32) +# EXCLUDE_FROM_ALL doesn't seem to be working in VS +ADD_SUBDIRECTORY(tests) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d956a41..a8d6927 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,9 +25,8 @@ IF(UNIX) ENDIF(UNIX) INSTALL(FILES libaec.h szlib.h DESTINATION include) -INSTALL(TARGETS aec sz +INSTALL(TARGETS aec sz aec_client RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) -INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/aec DESTINATION bin) -- 2.7.4