diff options
Diffstat (limited to 'files/CMakeLists.txt')
| -rw-r--r-- | files/CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt index 188a26b7..d190507b 100644 --- a/files/CMakeLists.txt +++ b/files/CMakeLists.txt @@ -22,6 +22,10 @@ LIST ( SORT ly_unittest_sources ) INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} ) +if(MSVC) + ADD_DEFINITIONS ( -D_CRT_SECURE_NO_WARNINGS ) +endif() + # this creates the static library (.a) ADD_LIBRARY ( ${ly_lib_static} STATIC ${ly_source_files} ) @@ -29,6 +33,9 @@ ADD_LIBRARY ( ${ly_lib_static} STATIC ${ly_source_files} ) ADD_LIBRARY ( ${ly_lib_shared} SHARED ${ly_source_files} ) SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}" ) SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" ) +if(WIN32) + SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES IMPORT_PREFIX "lib" ) +endif() # this creates the conversion tool ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc ) @@ -71,12 +78,6 @@ if(TEST) if(NACL AND NACL_LIBC STREQUAL "newlib") target_link_libraries(libyuv_unittest glibc-compat) endif() - - find_library(GFLAGS_LIBRARY gflags) - if(NOT GFLAGS_LIBRARY STREQUAL "GFLAGS_LIBRARY-NOTFOUND") - target_link_libraries(libyuv_unittest gflags) - add_definitions(-DLIBYUV_USE_GFLAGS) - endif() endif() |