projects / ceph.git / blame
| Commit | Line | Data |
|---|---|---|
| 1e59de90 TL |
1 | diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt |
| 2 | index 47c4ed13..f13ff531 100644 | |
| 3 | --- a/Project/CMake/CMakeLists.txt | |
| 4 | +++ b/Project/CMake/CMakeLists.txt | |
| 5 | @@ -88,7 +88,7 @@ endif() | |
| 6 | find_package(TinyXML) | |
| 7 | ||
| 8 | # use system curl if is present | |
| 9 | -find_package(CURL) | |
| 10 | +find_package(CURL CONFIG REQUIRED) | |
| 11 | ||
| 12 | include_directories(${MediaInfoLib_SOURCES_PATH}) | |
| 13 | include_directories(${MediaInfoLib_SOURCES_PATH}/ThirdParty/md5/) | |
| 14 | @@ -398,13 +398,7 @@ endif() | |
| 15 | target_link_libraries(mediainfo ${ZenLib_LIBRARY} ${ZLIB_LIBRARIES}) | |
| 16 | ||
| 17 | if(MSVC AND BUILD_SHARED_LIBS) | |
| 18 | - get_target_property(LOCATION mediainfo LOCATION_DEBUG) | |
| 19 | - string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") | |
| 20 | - install(FILES ${LOCATION} DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) | |
| 21 | - | |
| 22 | - get_target_property(LOCATION mediainfo LOCATION_RELWITHDEBINFO) | |
| 23 | - string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") | |
| 24 | - install(FILES ${LOCATION} DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) | |
| 25 | + install(FILES $<TARGET_PDB_FILE:mediainfo> DESTINATION ${BIN_INSTALL_DIR} OPTIONAL) | |
| 26 | endif() | |
| 27 | ||
| 28 | if (APPLE) | |
| 29 | diff --git a/Source/ThirdParty/aes-gladman/aesopt.h b/Source/ThirdParty/aes-gladman/aesopt.h | |
| 30 | index 6ad9ca1e..a858396f 100644 | |
| 31 | --- a/Source/ThirdParty/aes-gladman/aesopt.h | |
| 32 | +++ b/Source/ThirdParty/aes-gladman/aesopt.h | |
| 33 | @@ -183,6 +183,6 @@ Issue Date: 20/12/2007 | |
| 34 | AES_REV_DKS must NOT be defined when such assembler files are | |
| 35 | built | |
| 36 | */ | |
| 37 | -#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) | |
| 38 | +#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) && defined( _M_AMD64 ) | |
| 39 | # define INTEL_AES_POSSIBLE | |
| 40 | #endif | |
| 41 | diff --git a/Source/ThirdParty/aes-gladman/brg_endian.h b/Source/ThirdParty/aes-gladman/brg_endian.h | |
| 42 | index 4c34f2b5..fae471b9 100644 | |
| 43 | --- a/Source/ThirdParty/aes-gladman/brg_endian.h | |
| 44 | +++ b/Source/ThirdParty/aes-gladman/brg_endian.h | |
| 45 | @@ -110,7 +110,8 @@ Issue Date: 20/12/2007 | |
| 46 | defined( __MRC__ ) || defined( __MVS__ ) || defined( __MWERKS__ ) || \ | |
| 47 | defined( sparc ) || defined( __sparc) || defined( SYMANTEC_C ) || \ | |
| 48 | defined( __VOS__ ) || defined( __TIGCC__ ) || defined( __TANDEM ) || \ | |
| 49 | - defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX ) | |
| 50 | + defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX ) || \ | |
| 51 | + defined( _M_ARM64 ) || defined ( _M_ARM ) | |
| 52 | # define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN | |
| 53 | ||
| 54 | #elif 0 /* **** EDIT HERE IF NECESSARY **** */ |