]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Change all SET_TARGET_PROPERTIES to SET_PROPERTY 668/head
authorMilan Ševčík <majlen@civ.zcu.cz>
Wed, 19 Apr 2017 18:16:11 +0000 (20:16 +0200)
committerMilan Ševčík <majlen@civ.zcu.cz>
Wed, 19 Apr 2017 19:34:17 +0000 (21:34 +0200)
SET_PROPERTY function can append to lists, whereas previously used
SET_TARGET_PROPERTIES cannot.

build/cmake/contrib/pzstd/CMakeLists.txt
build/cmake/lib/CMakeLists.txt
build/cmake/programs/CMakeLists.txt

index b4fbe1689cf55a838e18276d151d515bdb9de83a..71def02cd4bba8ac56ba61dcdfb7bf6af0cbd7f8 100644 (file)
@@ -21,8 +21,8 @@ SET(PZSTD_DIR ${ZSTD_SOURCE_DIR}/contrib/pzstd)
 INCLUDE_DIRECTORIES(${PROGRAMS_DIR} ${LIBRARY_DIR} ${LIBRARY_DIR}/common ${PZSTD_DIR})
 
 ADD_EXECUTABLE(pzstd ${PZSTD_DIR}/main.cpp ${PZSTD_DIR}/Options.cpp ${PZSTD_DIR}/Pzstd.cpp ${PZSTD_DIR}/SkippableFrame.cpp)
-SET_TARGET_PROPERTIES(pzstd PROPERTIES COMPILE_DEFINITIONS "NDEBUG")
-SET_TARGET_PROPERTIES(pzstd PROPERTIES COMPILE_OPTIONS "-Wno-shadow")
+SET_PROPERTY(TARGET pzstd APPEND PROPERTY COMPILE_DEFINITIONS "NDEBUG")
+SET_PROPERTY(TARGET pzstd APPEND PROPERTY COMPILE_OPTIONS "-Wno-shadow")
 
 SET(THREADS_PREFER_PTHREAD_FLAG ON)
 FIND_PACKAGE(Threads REQUIRED)
index 50618f4a8ddc49395fc27244bdb9b62b97267913..5e945ff1274fb3496342a15d90d8f508716df6c0 100644 (file)
@@ -97,9 +97,9 @@ ENDIF (ZSTD_BUILD_STATIC)
 
 # Add specific compile definitions for MSVC project
 IF (MSVC)
-    SET_TARGET_PROPERTIES(libzstd_shared PROPERTIES COMPILE_DEFINITIONS "ZSTD_DLL_EXPORT=1;ZSTD_HEAPMODE=0;_CONSOLE;_CRT_SECURE_NO_WARNINGS")
+    SET_PROPERTY(TARGET libzstd_shared APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_DLL_EXPORT=1;ZSTD_HEAPMODE=0;_CONSOLE;_CRT_SECURE_NO_WARNINGS")
     IF (ZSTD_BUILD_STATIC)
-        SET_TARGET_PROPERTIES(libzstd_static PROPERTIES COMPILE_DEFINITIONS "ZSTD_HEAPMODE=0;_CRT_SECURE_NO_WARNINGS")
+        SET_PROPERTY(TARGET libzstd_static APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_HEAPMODE=0;_CRT_SECURE_NO_WARNINGS")
     ENDIF (ZSTD_BUILD_STATIC)
 ENDIF (MSVC)
 
index c3e68e01cdc9465da87546a1a731839f13338feb..cb6aa9218316bd8e7668ed47d25b37dfdd4ec329 100644 (file)
@@ -49,11 +49,11 @@ IF (UNIX)
 
     ADD_EXECUTABLE(zstd-frugal ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/fileio.c)
     TARGET_LINK_LIBRARIES(zstd-frugal libzstd_shared)
-    SET_TARGET_PROPERTIES(zstd-frugal PROPERTIES COMPILE_DEFINITIONS "ZSTD_NOBENCH;ZSTD_NODICT")
+    SET_PROPERTY(TARGET zstd-frugal APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_NOBENCH;ZSTD_NODICT")
 ENDIF (UNIX)
 
 IF (ZSTD_MULTITHREAD_SUPPORT)
-    SET_TARGET_PROPERTIES(zstd PROPERTIES COMPILE_DEFINITIONS "ZSTD_MULTITHREAD")
+    SET_PROPERTY(TARGET zstd APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_MULTITHREAD")
 
     SET(THREADS_PREFER_PTHREAD_FLAG ON)
     FIND_PACKAGE(Threads REQUIRED)
@@ -75,8 +75,8 @@ IF (ZSTD_ZLIB_SUPPORT)
 
     IF (ZLIB_FOUND)
         INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
-       TARGET_LINK_LIBRARIES(zstd ${ZLIB_LIBRARIES})
-        SET_TARGET_PROPERTIES(zstd PROPERTIES COMPILE_DEFINITIONS "ZSTD_GZCOMPRESS;ZSTD_GZDECOMPRESS")
+        TARGET_LINK_LIBRARIES(zstd ${ZLIB_LIBRARIES})
+        SET_PROPERTY(TARGET zstd APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_GZCOMPRESS;ZSTD_GZDECOMPRESS")
     ELSE ()
         MESSAGE(SEND_ERROR "zlib library is missing")
     ENDIF ()
@@ -87,8 +87,8 @@ IF (ZSTD_LZMA_SUPPORT)
 
     IF (LIBLZMA_FOUND)
         INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
-       TARGET_LINK_LIBRARIES(zstd ${LIBLZMA_LIBRARIES})
-       SET_TARGET_PROPERTIES(zstd PROPERTIES COMPILE_DEFINITIONS "ZSTD_LZMACOMPRESS;ZSTD_LZMADECOMPRESS")
+        TARGET_LINK_LIBRARIES(zstd ${LIBLZMA_LIBRARIES})
+        SET_PROPERTY(TARGET zstd APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_LZMACOMPRESS;ZSTD_LZMADECOMPRESS")
     ELSE ()
         MESSAGE(SEND_ERROR "lzma library is missing")
     ENDIF ()