Merge pull request #1337 from evgenyz/cmake-papercuts

CMake papercuts

Author: jan-cerny

CMakeLists.txt

@@ -529,14 +529,16 @@ set(CPACK_SOURCE_IGNORE_FILES
 	"~$"
 	"\\\\CMakeLists.txt.user"
 )
-set(CPACK_GENERATOR WIX)
+if(WIN32)
+	set(CPACK_GENERATOR WIX)
+	set(CPACK_WIX_PATCH_FILE "${CMAKE_SOURCE_DIR}/wix_patch.xml")
+endif()
 set(CPACK_PACKAGE_NAME "OpenSCAP")
 set(CPACK_PACKAGE_VENDOR "OpenSCAP Project")
 set(CPACK_PACKAGE_VERSION_MAJOR "${OPENSCAP_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${OPENSCAP_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${OPENSCAP_VERSION_PATCH}")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/lgpl-2.1.rtf")
-set(CPACK_WIX_PATCH_FILE "${CMAKE_SOURCE_DIR}/wix_patch.xml")
 set(CPACK_PACKAGE_CHECKSUM SHA512)
 
 include(CPack)

swig/CMakeLists.txt

@@ -1,3 +1,15 @@
+# UseSWIG generates standard target names
+# Run "cmake --help-policy CMP0078" for policy details
+if (POLICY CMP0078)
+	cmake_policy(SET CMP0078 OLD)
+endif()
+
+# UseSWIG honors SWIG_MODULE_NAME via -module
+# Run "cmake --help-policy CMP0086" for policy details
+if (POLICY CMP0086)
+	cmake_policy(SET CMP0086 OLD)
+endif()
+
 if(ENABLE_PERL)
 	add_subdirectory("perl")
 endif()