Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
hysop
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
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
particle_methods
hysop
Commits
72b56a6b
Commit
72b56a6b
authored
12 years ago
by
Franck Pérignon
Browse files
Options
Downloads
Patches
Plain Diff
Allow comp/link without fftw and/or scales - fix bug
parent
b1c1eee9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
HySoP/src/CMakeLists.txt
+19
-12
19 additions, 12 deletions
HySoP/src/CMakeLists.txt
with
19 additions
and
12 deletions
HySoP/src/CMakeLists.txt
+
19
−
12
View file @
72b56a6b
...
...
@@ -7,7 +7,7 @@
# --- Set a version number for the package ---
set
(
${
PARMES_LIBRARY_NAME
}
_version 1.0.0
)
# --- The name of the exe to be created (test purpose)
# This exe will be linked with libPARMES_LIBRARY_NAME
set
(
EXE_NAME
${
PARMES_LIBRARY_NAME
}
Run
)
...
...
@@ -15,8 +15,14 @@ set(EXE_NAME ${PARMES_LIBRARY_NAME}Run)
# Any file in those dirs will be used to create libparmes
set
(
${
PARMES_LIBRARY_NAME
}
_SRCDIRS
.
fftw
)
if
(
WITH_FFTW
)
set
(
${
PARMES_LIBRARY_NAME
}
_SRCDIRS
${${
PARMES_LIBRARY_NAME
}
_SRCDIRS
}
fftw
)
endif
()
# --- scales ---
if
(
WITH_SCALES
)
set
(
${
PARMES_LIBRARY_NAME
}
_SRCDIRS
...
...
@@ -74,15 +80,14 @@ append_Fortran_FLAGS("-Wall -fPIC")
if
(
WITH_PPM
)
add_subdirectory
(
ppmInterface
)
endif
()
if
(
WITH_FFTW
)
find_package
(
FFTW REQUIRED
)
include_directories
(
${
FFTW_INCLUDE_DIRS
}
)
set
(
LIBS
${
LIBS
}
${
FFTW_LIBRARIES
}
)
endif
()
# for python setup.py
set
(
FFTWLIB
${
FFTW_LIBRARY
}
PARENT_SCOPE
)
# for python setup.py
set
(
FFTWLIB
${
FFTW_LIBRARY
}
PARENT_SCOPE
)
endif
()
# ============= Generates ParmesConfig.hpp =============
# The file PARMES_LIBRARY_NAME_defines.hpp will be generated from config.hpp.cmake;
if
(
EXISTS
${
CMAKE_SOURCE_DIR
}
/config.hpp.cmake
)
...
...
@@ -159,12 +164,14 @@ target_link_libraries(${PARMES_LIBRARY_NAME} ${LIBS})
### set(PARMES_LINKED_LIBRARIES ${LIBS} ${PARMES_LIBRARY_NAME} PARENT_SCOPE)
# ============= Creates the executable =============
add_executable
(
${
EXE_NAME
}
${${
EXE_NAME
}
_SRC
}
)
add_dependencies
(
${
EXE_NAME
}
${
PARMES_LIBRARY_NAME
}
)
# libs to link with EXE_NAME
target_link_libraries
(
${
EXE_NAME
}
${
PARMES_LIBRARY_NAME
}
)
target_link_libraries
(
${
EXE_NAME
}
${
LIBS
}
)
if
(
WITH_FFTW
)
add_executable
(
${
EXE_NAME
}
${${
EXE_NAME
}
_SRC
}
)
add_dependencies
(
${
EXE_NAME
}
${
PARMES_LIBRARY_NAME
}
)
# libs to link with EXE_NAME
target_link_libraries
(
${
EXE_NAME
}
${
PARMES_LIBRARY_NAME
}
)
target_link_libraries
(
${
EXE_NAME
}
${
LIBS
}
)
endif
()
# ============== Add tests ==============
if
(
WITH_TESTS
)
...
...
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