You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@milagro.apache.org by gi...@apache.org on 2019/06/29 20:05:17 UTC
[incubator-milagro-crypto-c] branch sonar_review updated (672c1e0
-> cbefcb2)
This is an automated email from the ASF dual-hosted git repository.
giorgio pushed a change to branch sonar_review
in repository https://gitbox.apache.org/repos/asf/incubator-milagro-crypto-c.git.
from 672c1e0 modified: CPackConfig.cmake
new fd1aaa0 modified: test/test_aes_encrypt.c
new cbefcb2 modified: CPackConfig.cmake
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 1 +
test/test_aes_encrypt.c | 16 +++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
[incubator-milagro-crypto-c] 01/02: modified:
test/test_aes_encrypt.c
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
giorgio pushed a commit to branch sonar_review
in repository https://gitbox.apache.org/repos/asf/incubator-milagro-crypto-c.git
commit fd1aaa0197542cfd313a0dec34c513c0e4552409
Author: Giorgio Zoppi <gi...@gmail.com>
AuthorDate: Sat Jun 29 22:01:40 2019 +0200
modified: test/test_aes_encrypt.c
---
.gitignore | 1 +
CPackConfig.cmake | 136 ++++++++++++++++++++++++++++--------------------
test/test_aes_encrypt.c | 16 ++++--
3 files changed, 95 insertions(+), 58 deletions(-)
diff --git a/.gitignore b/.gitignore
index c1efd00..4091fe8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
build
target
*~
+CPackConfig.cmake
diff --git a/CPackConfig.cmake b/CPackConfig.cmake
index f46fc79..3ffd1b1 100644
--- a/CPackConfig.cmake
+++ b/CPackConfig.cmake
@@ -1,62 +1,88 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
+# This file will be configured to contain variables for CPack. These variables
+# should be set in the CMake list file of the project before CPack module is
+# included. The list of available CPACK_xxx variables and their associated
+# documentation may be obtained using
+# cpack --help-variable-list
#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-include (InstallRequiredSystemLibraries)
-
-########################### General Settings ###########################
-set(CPACK_PACKAGE_NAME "AMCL")
-set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
-set(CPACK_PACKAGE_RELEASE 1)
-set(CPACK_DESCRIPTION_SUMMARY "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-set(CPACK_PACKAGE_VENDOR "MILAGRO")
-set(CPACK_PACKAGE_CONTACT "dev@milagro.apache.org")
-set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}")
+# Some variables are common to all generators (e.g. CPACK_PACKAGE_NAME)
+# and some are specific to a generator
+# (e.g. CPACK_NSIS_EXTRA_INSTALL_COMMANDS). The generator specific variables
+# usually begin with CPACK_<GENNAME>_xxxx.
-if (BUILD_PYTHON)
- set(CPACK_RPM_PACKAGE_REQUIRES "python >= 2.7.0")
-endif (BUILD_PYTHON)
-set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
+SET(CPACK_BINARY_7Z "")
+SET(CPACK_BINARY_BUNDLE "")
+SET(CPACK_BINARY_CYGWIN "")
+SET(CPACK_BINARY_DEB "")
+SET(CPACK_BINARY_DRAGNDROP "")
+SET(CPACK_BINARY_FREEBSD "")
+SET(CPACK_BINARY_IFW "")
+SET(CPACK_BINARY_NSIS "")
+SET(CPACK_BINARY_OSXX11 "")
+SET(CPACK_BINARY_PACKAGEMAKER "")
+SET(CPACK_BINARY_PRODUCTBUILD "")
+SET(CPACK_BINARY_RPM "")
+SET(CPACK_BINARY_STGZ "")
+SET(CPACK_BINARY_TBZ2 "")
+SET(CPACK_BINARY_TGZ "")
+SET(CPACK_BINARY_TXZ "")
+SET(CPACK_BINARY_TZ "")
+SET(CPACK_BINARY_WIX "")
+SET(CPACK_BINARY_ZIP "")
+SET(CPACK_BUILD_SOURCE_DIRS "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c;/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c")
+SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
+SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
+SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
+SET(CPACK_DESCRIPTION_SUMMARY "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/README.md")
+SET(CPACK_GENERATOR "RPM")
+SET(CPACK_INSTALL_CMAKE_PROJECTS "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c;AMCL;ALL;/")
+SET(CPACK_INSTALL_PREFIX "/usr/local")
+SET(CPACK_MODULE_PATH "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/cmake;/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/cmake")
+SET(CPACK_NSIS_DISPLAY_NAME "AMCL 0.1.0")
+SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
+SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
+SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
+SET(CPACK_NSIS_PACKAGE_NAME "AMCL 0.1.0")
+SET(CPACK_OUTPUT_CONFIG_FILE "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/CPackConfig.cmake")
+SET(CPACK_PACKAGE_CONTACT "dev@milagro.apache.org")
+SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "/usr/share/cmake-3.10/Templates/CPack.GenericDescription.txt")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMCL built using CMake")
+SET(CPACK_PACKAGE_FILE_NAME "AMCL-0.1.0-1.x86_64")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "AMCL 0.1.0")
+SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "AMCL 0.1.0")
+SET(CPACK_PACKAGE_NAME "AMCL")
+SET(CPACK_PACKAGE_RELEASE "1")
+SET(CPACK_PACKAGE_RELOCATABLE "true")
+SET(CPACK_PACKAGE_VENDOR "MILAGRO")
+SET(CPACK_PACKAGE_VERSION "0.1.0")
+SET(CPACK_PACKAGE_VERSION_MAJOR "0")
+SET(CPACK_PACKAGE_VERSION_MINOR "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local")
+SET(CPACK_RESOURCE_FILE_LICENSE "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/LICENSE")
+SET(CPACK_RESOURCE_FILE_README "/usr/share/cmake-3.10/Templates/CPack.GenericDescription.txt")
+SET(CPACK_RESOURCE_FILE_WELCOME "/usr/share/cmake-3.10/Templates/CPack.GenericWelcome.txt")
+SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/local;/usr/local/bin;/usr/local/include;/usr/local/lib;;")
+SET(CPACK_SET_DESTDIR "OFF")
+SET(CPACK_SOURCE_7Z "")
+SET(CPACK_SOURCE_CYGWIN "")
+SET(CPACK_SOURCE_GENERATOR "TBZ2;TGZ;TXZ;TZ")
+SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/CPackSourceConfig.cmake")
+SET(CPACK_SOURCE_RPM "OFF")
+SET(CPACK_SOURCE_TBZ2 "ON")
+SET(CPACK_SOURCE_TGZ "ON")
+SET(CPACK_SOURCE_TXZ "ON")
+SET(CPACK_SOURCE_TZ "ON")
+SET(CPACK_SOURCE_ZIP "OFF")
+SET(CPACK_SYSTEM_NAME "Linux")
+SET(CPACK_TOPLEVEL_TAG "Linux")
+SET(CPACK_WIX_SIZEOF_VOID_P "8")
-########################### Linux Settings ###########################
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-
- # Prevents CPack from generating file conflicts
- set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}")
- list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}/bin")
- list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}/include")
- list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}/lib")
- list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${PYTHON_SITE_LIB}")
- list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${PYTHON_SITE_PACKAGES}")
- set(CPACK_GENERATOR "RPM")
+if(NOT CPACK_PROPERTIES_FILE)
+ set(CPACK_PROPERTIES_FILE "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/CPackProperties.cmake")
endif()
-########################### Windows Settings ###########################
-if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- set(CPACK_PACKAGE_INSTALL_DIRECTORY "AMCL")
- set(CPACK_NSIS_MODIFY_PATH ON)
- set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/icon\\\\icon.bmp")
- set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/resources/icon\\\\icon.ico")
- set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/resources/icon\\\\icon.ico")
- set(CPACK_NSIS_HELP_LINK "http://milagro.apache.org/docs/milagro-intro")
- set(CPACK_NSIS_URL_INFO_ABOUT "http://milagro.apache.org/docs/milagro-intro")
- set(CPACK_NSIS_CONTACT "dev@milagro.apache.org")
+if(EXISTS ${CPACK_PROPERTIES_FILE})
+ include(${CPACK_PROPERTIES_FILE})
endif()
-
-include (CPack)
diff --git a/test/test_aes_encrypt.c b/test/test_aes_encrypt.c
index 3c61c27..6aa15b0 100644
--- a/test/test_aes_encrypt.c
+++ b/test/test_aes_encrypt.c
@@ -134,7 +134,10 @@ int main(int argc, char** argv)
KEYLen = l1/2;
KEY = (char*) malloc (KEYLen);
if (KEY==NULL)
+ {
+ fclose(fp);
exit(EXIT_FAILURE);
+ }
// KEY binary value
amcl_hex2bin(linePtr, KEY, l1);
@@ -153,8 +156,10 @@ int main(int argc, char** argv)
IVLen = l1/2;
IV = (char*) malloc (IVLen);
if (IV==NULL)
+ {
+ fclose(fp);
exit(EXIT_FAILURE);
-
+ }
// IV binary value
amcl_hex2bin(linePtr, IV, l1);
}
@@ -172,8 +177,10 @@ int main(int argc, char** argv)
PLAINTEXTLen = l1/2;
PLAINTEXT = (char*) malloc(PLAINTEXTLen);
if (PLAINTEXT==NULL)
+ {
+ fclose(fp);
exit(EXIT_FAILURE);
-
+ }
// PLAINTEXT binary value
amcl_hex2bin(linePtr, PLAINTEXT, l1);
}
@@ -190,8 +197,10 @@ int main(int argc, char** argv)
l1 = strlen(linePtr);
CIPHERTEXT1 = (char*) malloc(PLAINTEXTLen+1);
if (CIPHERTEXT1==NULL)
+ {
+ fclose(fp);
exit(EXIT_FAILURE);
-
+ }
// Golden CIPHERTEXT value
octet CIPHERTEXT1Oct= {PLAINTEXTLen,PLAINTEXTLen,CIPHERTEXT1};
amcl_hex2bin(linePtr, CIPHERTEXT1, l1);
@@ -227,6 +236,7 @@ int main(int argc, char** argv)
if (!rc)
{
printf("TEST AES ENCRYPT FAILED COMPARE CIPHERTEXT LINE %d\n",lineNo);
+ fclose(fp);
exit(EXIT_FAILURE);
}
[incubator-milagro-crypto-c] 02/02: modified: CPackConfig.cmake
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
giorgio pushed a commit to branch sonar_review
in repository https://gitbox.apache.org/repos/asf/incubator-milagro-crypto-c.git
commit cbefcb2b88dc6e3080cf6c2fa431b8ae95e5284b
Author: Giorgio Zoppi <gi...@gmail.com>
AuthorDate: Sat Jun 29 22:04:17 2019 +0200
modified: CPackConfig.cmake
---
CPackConfig.cmake | 136 ++++++++++++++++++++++--------------------------------
1 file changed, 55 insertions(+), 81 deletions(-)
diff --git a/CPackConfig.cmake b/CPackConfig.cmake
index 3ffd1b1..f46fc79 100644
--- a/CPackConfig.cmake
+++ b/CPackConfig.cmake
@@ -1,88 +1,62 @@
-# This file will be configured to contain variables for CPack. These variables
-# should be set in the CMake list file of the project before CPack module is
-# included. The list of available CPACK_xxx variables and their associated
-# documentation may be obtained using
-# cpack --help-variable-list
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
#
-# Some variables are common to all generators (e.g. CPACK_PACKAGE_NAME)
-# and some are specific to a generator
-# (e.g. CPACK_NSIS_EXTRA_INSTALL_COMMANDS). The generator specific variables
-# usually begin with CPACK_<GENNAME>_xxxx.
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+include (InstallRequiredSystemLibraries)
+
+########################### General Settings ###########################
+set(CPACK_PACKAGE_NAME "AMCL")
+set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+set(CPACK_PACKAGE_RELEASE 1)
+set(CPACK_DESCRIPTION_SUMMARY "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set(CPACK_PACKAGE_VENDOR "MILAGRO")
+set(CPACK_PACKAGE_CONTACT "dev@milagro.apache.org")
+set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}")
+if (BUILD_PYTHON)
+ set(CPACK_RPM_PACKAGE_REQUIRES "python >= 2.7.0")
+endif (BUILD_PYTHON)
-SET(CPACK_BINARY_7Z "")
-SET(CPACK_BINARY_BUNDLE "")
-SET(CPACK_BINARY_CYGWIN "")
-SET(CPACK_BINARY_DEB "")
-SET(CPACK_BINARY_DRAGNDROP "")
-SET(CPACK_BINARY_FREEBSD "")
-SET(CPACK_BINARY_IFW "")
-SET(CPACK_BINARY_NSIS "")
-SET(CPACK_BINARY_OSXX11 "")
-SET(CPACK_BINARY_PACKAGEMAKER "")
-SET(CPACK_BINARY_PRODUCTBUILD "")
-SET(CPACK_BINARY_RPM "")
-SET(CPACK_BINARY_STGZ "")
-SET(CPACK_BINARY_TBZ2 "")
-SET(CPACK_BINARY_TGZ "")
-SET(CPACK_BINARY_TXZ "")
-SET(CPACK_BINARY_TZ "")
-SET(CPACK_BINARY_WIX "")
-SET(CPACK_BINARY_ZIP "")
-SET(CPACK_BUILD_SOURCE_DIRS "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c;/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c")
-SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
-SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
-SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
-SET(CPACK_DESCRIPTION_SUMMARY "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/README.md")
-SET(CPACK_GENERATOR "RPM")
-SET(CPACK_INSTALL_CMAKE_PROJECTS "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c;AMCL;ALL;/")
-SET(CPACK_INSTALL_PREFIX "/usr/local")
-SET(CPACK_MODULE_PATH "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/cmake;/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/cmake")
-SET(CPACK_NSIS_DISPLAY_NAME "AMCL 0.1.0")
-SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
-SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
-SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
-SET(CPACK_NSIS_PACKAGE_NAME "AMCL 0.1.0")
-SET(CPACK_OUTPUT_CONFIG_FILE "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/CPackConfig.cmake")
-SET(CPACK_PACKAGE_CONTACT "dev@milagro.apache.org")
-SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "/usr/share/cmake-3.10/Templates/CPack.GenericDescription.txt")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMCL built using CMake")
-SET(CPACK_PACKAGE_FILE_NAME "AMCL-0.1.0-1.x86_64")
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "AMCL 0.1.0")
-SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "AMCL 0.1.0")
-SET(CPACK_PACKAGE_NAME "AMCL")
-SET(CPACK_PACKAGE_RELEASE "1")
-SET(CPACK_PACKAGE_RELOCATABLE "true")
-SET(CPACK_PACKAGE_VENDOR "MILAGRO")
-SET(CPACK_PACKAGE_VERSION "0.1.0")
-SET(CPACK_PACKAGE_VERSION_MAJOR "0")
-SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
-SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local")
-SET(CPACK_RESOURCE_FILE_LICENSE "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/LICENSE")
-SET(CPACK_RESOURCE_FILE_README "/usr/share/cmake-3.10/Templates/CPack.GenericDescription.txt")
-SET(CPACK_RESOURCE_FILE_WELCOME "/usr/share/cmake-3.10/Templates/CPack.GenericWelcome.txt")
-SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/local;/usr/local/bin;/usr/local/include;/usr/local/lib;;")
-SET(CPACK_SET_DESTDIR "OFF")
-SET(CPACK_SOURCE_7Z "")
-SET(CPACK_SOURCE_CYGWIN "")
-SET(CPACK_SOURCE_GENERATOR "TBZ2;TGZ;TXZ;TZ")
-SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/CPackSourceConfig.cmake")
-SET(CPACK_SOURCE_RPM "OFF")
-SET(CPACK_SOURCE_TBZ2 "ON")
-SET(CPACK_SOURCE_TGZ "ON")
-SET(CPACK_SOURCE_TXZ "ON")
-SET(CPACK_SOURCE_TZ "ON")
-SET(CPACK_SOURCE_ZIP "OFF")
-SET(CPACK_SYSTEM_NAME "Linux")
-SET(CPACK_TOPLEVEL_TAG "Linux")
-SET(CPACK_WIX_SIZEOF_VOID_P "8")
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
-if(NOT CPACK_PROPERTIES_FILE)
- set(CPACK_PROPERTIES_FILE "/home/jozoppi/milagro-c/sonar_review/incubator-milagro-crypto-c/CPackProperties.cmake")
+########################### Linux Settings ###########################
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+
+ # Prevents CPack from generating file conflicts
+ set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}")
+ list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}/bin")
+ list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}/include")
+ list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}/lib")
+ list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${PYTHON_SITE_LIB}")
+ list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${PYTHON_SITE_PACKAGES}")
+ set(CPACK_GENERATOR "RPM")
endif()
-if(EXISTS ${CPACK_PROPERTIES_FILE})
- include(${CPACK_PROPERTIES_FILE})
+########################### Windows Settings ###########################
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "AMCL")
+ set(CPACK_NSIS_MODIFY_PATH ON)
+ set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/icon\\\\icon.bmp")
+ set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/resources/icon\\\\icon.ico")
+ set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/resources/icon\\\\icon.ico")
+ set(CPACK_NSIS_HELP_LINK "http://milagro.apache.org/docs/milagro-intro")
+ set(CPACK_NSIS_URL_INFO_ABOUT "http://milagro.apache.org/docs/milagro-intro")
+ set(CPACK_NSIS_CONTACT "dev@milagro.apache.org")
endif()
+
+include (CPack)