Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VirtualFluids
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
iRMB
VirtualFluids
Commits
d8c8bc72
Commit
d8c8bc72
authored
4 years ago
by
Soeren Peters
Browse files
Options
Downloads
Patches
Plain Diff
Small clean ups.
parent
22c72116
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMake/compilerflags/Intel.cmake
+4
-0
4 additions, 0 deletions
CMake/compilerflags/Intel.cmake
cpu.cmake
+0
-16
0 additions, 16 deletions
cpu.cmake
src/cpu/VirtualFluidsCore/CMakeLists.txt
+0
-6
0 additions, 6 deletions
src/cpu/VirtualFluidsCore/CMakeLists.txt
with
4 additions
and
22 deletions
CMake/compilerflags/Intel.cmake
+
4
−
0
View file @
d8c8bc72
...
...
@@ -31,3 +31,7 @@ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
list
(
APPEND VF_LINK_OPTIONS -parallel
)
list
(
APPEND VF_LINK_OPTIONS -irc
)
# LIST(APPEND VF_COMPILER_DEFINITION MPICH_IGNORE_CXX_SEEK)
# LIST(APPEND VF_COMPILER_DEFINITION MPICH_SKIP_MPICXX)
This diff is collapsed.
Click to expand it.
cpu.cmake
+
0
−
16
View file @
d8c8bc72
...
...
@@ -28,7 +28,6 @@ SET(USE_METIS ON CACHE BOOL "include METIS library support")
SET
(
USE_MPI ON CACHE BOOL
"include MPI library support"
)
SET
(
USE_VTK OFF CACHE BOOL
"include VTK library support"
)
SET
(
USE_CATALYST OFF CACHE BOOL
"include Paraview Catalyst support"
)
#SET(USE_PYTHON OFF CACHE BOOL "include Python scripting support")
SET
(
USE_HLRN_LUSTRE OFF CACHE BOOL
"include HLRN Lustre support"
)
SET
(
USE_DEM_COUPLING OFF CACHE BOOL
"PE plugin"
)
...
...
@@ -41,7 +40,6 @@ ENDIF()
#VTK
IF
(
${
USE_VTK
}
)
#find_package(VTK 6.1 NO_MODULE)
FIND_PACKAGE
(
VTK REQUIRED
)
INCLUDE_DIRECTORIES
(
${
VTK_INCLUDE_DIRS
}
)
ENDIF
()
...
...
@@ -78,20 +76,6 @@ IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ia64")
ENDIF
()
# IF(${USE_PYTHON})
# FIND_PACKAGE(PythonLibs)
# INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
# LIST(APPEND VF_COMPILER_DEFINITION VF_PYTHON)
# LIST(APPEND VF_COMPILER_DEFINITION BOOST_PYTHON_STATIC_LIB)
# add_subdirectory(python)
# ENDIF()
# IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
# LIST(APPEND VF_COMPILER_DEFINITION MPICH_IGNORE_CXX_SEEK)
# LIST(APPEND VF_COMPILER_DEFINITION MPICH_SKIP_MPICXX)
# ENDIF()
add_subdirectory
(
${
VF_THIRD_DIR
}
/MuParser
)
add_subdirectory
(
src/cpu/VirtualFluidsCore
)
...
...
This diff is collapsed.
Click to expand it.
src/cpu/VirtualFluidsCore/CMakeLists.txt
+
0
−
6
View file @
d8c8bc72
...
...
@@ -17,12 +17,6 @@ IF(${USE_CATALYST})
ENDIF
()
IF
(
${
USE_PYTHON
}
)
SET
(
LINK_LIBRARY optimized
${
PYTHON_LIBRARY
}
debug
${
PYTHON_LIBRARY
}
)
SET
(
CAB_ADDITIONAL_LINK_LIBRARIES
${
CAB_ADDITIONAL_LINK_LIBRARIES
}
${
LINK_LIBRARY
}
)
ENDIF
()
IF
(
${
USE_DEM_COUPLING
}
)
INCLUDE
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/../DemCoupling/DemCoupling.cmake
)
ENDIF
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment