Permalink
Browse files

Merge branch 'master' of https://github.com/SASfit/SASfit

  • Loading branch information...
Kohlbrecher committed Oct 9, 2017
2 parents dc14400 + 9fb8167 commit bfd9b8448d180d1b0e834945204e464329925559
Showing with 13 additions and 11 deletions.
  1. +10 −4 src/CMakeLists.txt
  2. +1 −3 src/cmake/SasfitCmakeUtils.cmake
  3. +1 −3 src/cmake/SasfitSourceFiles.cmake
  4. +1 −1 src/cmake/create_starpack.cmake
View
@@ -344,20 +344,25 @@ if(CREATE_BINARY)
set(SASFIT_LIST_FILE ${SASFIT_BIN_LIST_FILE}.tmp)
file(WRITE ${SASFIT_LIST_FILE} "${SASFIT_BIN_FILE_LIST}")
add_custom_target(sasfit_binary ALL
add_custom_target(sasfit_binary ALL
${CMAKE_COMMAND} -D SASFIT_ROOT_DIR:PATH=${SASFIT_ROOT_DIR}
-D SASKIT_FILENAME:STRING=${SASKIT_FILENAME}
-D SASFIT_EXEC_FILENAME:STRING=${SASFIT_EXEC_FILENAME}
-D SASFIT_DEBUG:BOOL=${DEBUG}
-P ${SASFIT_STARPACK_SCRIPT}
DEPENDS sasfit ${SASFIT_PLUGINS_INCLUDED}
COMMENT "Creating sasfit binary ..."
VERBATIM
)
add_custom_target(sasfit_binary_package ALL
${CMAKE_COMMAND} -D SASFIT_ROOT_DIR:PATH=${SASFIT_ROOT_DIR}
-D SASFIT_PCKG_DIR_POSTFIX:STRING=${SASFIT_PCKG_DIR_POSTFIX}
-D SASFIT_LIST_FILE:FILEPATH=${SASFIT_LIST_FILE}
-D CM_GEN:STRING=${CMAKE_GENERATOR}
-D SASFIT_VERSION:STRING=${SASFIT_VERSION}
-P ${SASFIT_PCKG_SCRIPT}
DEPENDS sasfit ${SASFIT_PLUGINS_INCLUDED}
COMMENT "Copying sasfit binary files to a separate directory ..."
DEPENDS sasfit_binary
COMMENT "Creating sasfit package ..."
VERBATIM
)
@@ -369,7 +374,8 @@ if(CREATE_SOURCE)
### create a sasfit source package ###
####################################
# write the list of filenames to a temporary file (workaround for shell command length restrictions)
# write the list of filenames to a temporary file
# (workaround for shell command length restrictions)
set(SASFIT_LIST_FILE ${SASFIT_SRC_LIST_FILE}.tmp)
file(WRITE ${SASFIT_LIST_FILE} "${SASFIT_SRC_FILE_LIST}")
@@ -36,9 +36,7 @@
# This module expects to live in <sasfit-dir>/src/cmake
cmake_minimum_required(VERSION 2.6.2)
if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
cmake_policy(SET CMP0011 OLD)
endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
cmake_policy(SET CMP0011 NEW)
cmake_policy(SET CMP0012 NEW)
include(GetPrerequisites)
@@ -36,9 +36,7 @@
# This module expects to live in <sasfit-dir>/src/cmake
cmake_minimum_required(VERSION 2.6.2)
if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
cmake_policy(SET CMP0011 OLD)
endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
cmake_policy(SET CMP0011 NEW)
set(SOURCE_sasfit_common
sasfit_timer.c
@@ -64,7 +64,7 @@ else(SASKIT_RES EQUAL 0 OR SASKIT_RES STREQUAL "Process terminated due to timeou
message(STATUS "An error occured while creating executable '${SASFIT_EXEC}'!")
message("return value: '${SASKIT_RES}'")
message("output: '${SASKIT_OUT}'")
endif(SASKIT_RES EQUAL 0 OR SASKIT_RES STREQUAL "Process terminated due to timeout")
endif()
file(REMOVE ${SASKIT_FILE}_rt)
# vim: set ts=4 sw=4 sts=4 tw=0:

0 comments on commit bfd9b84

Please sign in to comment.