Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ScalFMM
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
solverstack
ScalFMM
Commits
63aeb8ab
Commit
63aeb8ab
authored
Sep 12, 2014
by
COULAUD Olivier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix problem with Cpack
parent
48c145c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
8 deletions
+13
-8
CMakeLists.txt
CMakeLists.txt
+12
-7
ToRemove/AdaptiveTree/testAdaptiveUnifFMM.cpp
ToRemove/AdaptiveTree/testAdaptiveUnifFMM.cpp
+1
-1
No files found.
CMakeLists.txt
View file @
63aeb8ab
...
...
@@ -57,6 +57,7 @@ OPTION( ScalFMM_USE_AVX "Set to ON to compile with AVX support"
OPTION
(
ScalFMM_USE_ASSERT
"Set to ON to enable safe tests during execution"
ON
)
OPTION
(
ScalFMM_USE_MIC_NATIVE
"Set to ON to compile in native mode for MIC"
OFF
)
OPTION
(
ScalFMM_BUILD_ONLY_LIB
"Set to ON to compile only the lib (examples are not compiled) "
OFF
)
OPTION
(
ScalFMM_ONLY_DEVEL
"Set to ON to compile Development tools (only scalfmm team)"
OFF
)
# Set scalfmm to default libraries
SET
(
SCALFMM_LIBRARIES
""
)
SET
(
ScaLFMM_CXX_FLAGS
""
)
...
...
@@ -168,7 +169,6 @@ endif(ScalFMM_ATTACHE_SOURCE)
if
(
ScalFMM_USE_BLAS
)
OPTION
(
ScalFMM_USE_MKL_AS_BLAS
"Set to ON to use MKL CBLAS"
OFF
)
if
(
ScalFMM_USE_MKL_AS_BLAS
)
MESSAGE
(
STATUS
"FFFFFFFFFFFFFFFFF "
${
CMAKE_CXX_COMPILER_ID
}
)
IF
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Intel"
)
SET
(
BLAS_LIBRARIES
"-mkl=sequential"
CACHE STRING
"Set your MKL flags"
)
else
()
...
...
@@ -338,7 +338,7 @@ endif()
##################################################################
# Build tools (Internal use) #
##################################################################
# Build - UTIL
# Build - UTIL
s
if
(
ScalFMM_ONLY_DEVEL
)
#if( NOT ScalFMM_BUILD_ONLY_LIB )
add_subdirectory
(
Utils
)
...
...
@@ -416,7 +416,6 @@ INSTALL(FILES
# build a CPack driven installer package #
# #
##################################################################
INCLUDE
(
CPack
)
#
# Use git commit number as CPACK_PACKAGE_VERSION_PATCH
set
(
CPACK_PACKAGE_VERSION_PATCH 0
)
...
...
@@ -425,18 +424,24 @@ execute_process(
OUTPUT_VARIABLE CPACK_PACKAGE_VERSION_PATCH
RESULT_VARIABLE RET
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
)
#
STRING_TRIM(PATCH1 PATCH)
)
#STRING_TRIM(PATCH1 PATCH)
SET
(
CPACK_INCLUDE_TOPLEVEL_DIRECTORY
"ON"
)
#
set
(
CPACK_RESOURCE_FILE_LICENSE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/Licence.txt"
)
SET
(
CPACK_PACKAGE_VERSION_MAJOR
"
${
ScalFMM_MAJOR_VERSION
}
"
)
SET
(
CPACK_PACKAGE_VERSION_
N
INOR
"
${
ScalFMM_MINOR_VERSION
}
"
)
SET
(
CPACK_PACKAGE_VERSION_
M
INOR
"
${
ScalFMM_MINOR_VERSION
}
"
)
#
SET
(
PACK_PACKAGE_VERSION
"
${
ScalFMM_MAJOR_VERSION
}
.
${
ScalFMM_MINOR_VERSION
}
-
${
CPACK_PACKAGE_VERSION_PATCH
}
"
)
SET
(
CPACK_SOURCE_GENERATOR
"TGZ"
)
SET
(
CPACK_SOURCE_PACKAGE_FILE_NAME
"ScalFMM-
${
ScalFMM_MAJOR_VERSION
}
.
${
ScalFMM_MINOR_VERSION
}
-
${
CPACK_PACKAGE_VERSION_PATCH
}
"
)
SET
(
CPACK_SOURCE_IGNORE_FILES
"
\\\\
.git;.DS_Store;.*~;/*.aux;/*.idx;/*.log;/*.out;/*.toc;/*.ilg;/*.ind;scalfmm.pro*;org.eclipse.core.resources.prefs;.cproject;.project"
)
LIST
(
APPEND CPACK_SOURCE_IGNORE_FILES
"
${
CMAKE_BINARY_DIR
}
;
${
CMAKE_SOURCE_DIR
}
/Utils/;Notes;Deprecated;Build*,noDist"
)
LIST
(
APPEND CPACK_SOURCE_IGNORE_FILES
"
${
CMAKE_BINARY_DIR
}
;
${
CMAKE_SOURCE_DIR
}
/Utils/;Notes;Deprecated;Build*;noDist;Bench;ToRemove;Olivier;tages;Uniform;GroupTree;Adaptive;testUnif*;/*Lagrange*"
)
#LIST(APPEND CPACK_SOURCE_IGNORE_FILES "Stages;Uniform;Adaptive;testUnif*;*Lagrange*" )
#
INCLUDE
(
CPack
)
#
#
##################################################################
# #
# PRINT MESSAGES #
...
...
ToRemove/AdaptiveTree/testAdaptiveUnifFMM.cpp
View file @
63aeb8ab
...
...
@@ -47,7 +47,7 @@
#include "Kernels/Interpolation/FInterpMatrixKernel.hpp"
#include "Kernels/Uniform/FUnifCell.hpp"
#include "Adaptive/FAdaptUnifKernel.hpp"
#include "Adaptive/FAdaptTools.hpp"
//
#include "Adaptive/FAdaptTools.hpp"
//
//
#include "Core/FFmmAlgorithm.hpp"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment