Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CrysFML
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Scientific Software
CrysFML
Commits
76cf6427
Commit
76cf6427
authored
Apr 27, 2020
by
juan rodriguez-carvajal
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://code.ill.fr/scientific-software/crysfml
parents
e4b08e85
eb78c2f7
Pipeline
#7268
passed with stages
in 11 minutes and 20 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
Src08/crysfml08_common.cmake
Src08/crysfml08_common.cmake
+4
-3
No files found.
Src08/crysfml08_common.cmake
View file @
76cf6427
...
...
@@ -289,7 +289,7 @@ set(LIBRARY_NAME crysfml)
add_library
(
${
LIBRARY_NAME
}
STATIC
${
CRYSFML_COMMON_SRC
}
)
# The directory where the CrysFML modules files will be stored.
set
(
CRYSFML_MODULE_DIRECTORY
${
PROJECT_BINARY_DIR
}
/Src08/
include
)
set
(
CRYSFML_MODULE_DIRECTORY
${
PROJECT_BINARY_DIR
}
/Src08/
crysfml_modules
)
# Sets the path where to place the mod files for the crysfml_common library.
set_target_properties
(
${
LIBRARY_NAME
}
PROPERTIES Fortran_MODULE_DIRECTORY
${
CRYSFML_MODULE_DIRECTORY
}
)
...
...
@@ -302,7 +302,8 @@ set_target_properties(${LIBRARY_NAME} PROPERTIES Fortran_MODULE_DIRECTORY ${CRYS
install
(
TARGETS
${
LIBRARY_NAME
}
ARCHIVE DESTINATION
${
CRYSFML_PREFIX
}
)
# The rules for installing the mod files. Take care the "/" is on purpose.
install
(
DIRECTORY
${
CRYSFML_MODULE_DIRECTORY
}
install
(
DIRECTORY
${
CRYSFML_MODULE_DIRECTORY
}
/
DESTINATION
${
CRYSFML_PREFIX
}
FILES_MATCHING
PATTERN
"*.*mod"
)
\ No newline at end of file
PATTERN
"*.*mod"
PATTERN CMakeFiles EXCLUDE
)
\ No newline at end of file
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