Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
parlib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
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
Debolskiy Andrey
parlib
Commits
bb8a56e9
Commit
bb8a56e9
authored
4 years ago
by
Debolskiy Andrey
Browse files
Options
Downloads
Patches
Plain Diff
reverted changes regarding target_sources
parent
19c52e11
Branches
Branches containing commit
Tags
cmake_build
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-1
2 additions, 1 deletion
CMakeLists.txt
ParLib.src/CMakeLists.txt
+21
-9
21 additions, 9 deletions
ParLib.src/CMakeLists.txt
ParLib.src/plutils/CMakeLists.txt
+6
-6
6 additions, 6 deletions
ParLib.src/plutils/CMakeLists.txt
with
29 additions
and
16 deletions
CMakeLists.txt
+
2
−
1
View file @
bb8a56e9
...
@@ -219,8 +219,9 @@ MACRO(print_conf_summary)
...
@@ -219,8 +219,9 @@ MACRO(print_conf_summary)
IF
(
CMAKE_PREFIX_PATH
)
IF
(
CMAKE_PREFIX_PATH
)
MESSAGE
(
STATUS
"CMake Prefix Path:
${
CMAKE_PREFIX_PATH
}
"
)
MESSAGE
(
STATUS
"CMake Prefix Path:
${
CMAKE_PREFIX_PATH
}
"
)
ENDIF
()
ENDIF
()
MESSAGE
(
STATUS
"CMAKE_C_COMPILER_ID:
${
CMAKE_C_COMPILER_ID
}
"
)
MESSAGE
(
STATUS
"CMAKE_LIB_DIR:
${
INSTALL_LIBDIR
}
"
)
MESSAGE
(
STATUS
"CMAKE_LIB_DIR:
${
INSTALL_LIBDIR
}
"
)
MESSAGE
(
STATUS
"CMAKE_
LIB
_DIR:
${
INSTALL_INCLUDEDIR
}
"
)
MESSAGE
(
STATUS
"CMAKE_
INCLUDE
_DIR:
${
INSTALL_INCLUDEDIR
}
"
)
MESSAGE
(
STATUS
"Build Type:
${
CMAKE_BUILD_TYPE
}
"
)
MESSAGE
(
STATUS
"Build Type:
${
CMAKE_BUILD_TYPE
}
"
)
MESSAGE
(
STATUS
"CMAKE_C_COMPILER:
${
CMAKE_C_COMPILER
}
"
)
MESSAGE
(
STATUS
"CMAKE_C_COMPILER:
${
CMAKE_C_COMPILER
}
"
)
MESSAGE
(
STATUS
"CMAKE_C_FLAGS:
${
CMAKE_C_FLAGS
}
"
)
MESSAGE
(
STATUS
"CMAKE_C_FLAGS:
${
CMAKE_C_FLAGS
}
"
)
...
...
This diff is collapsed.
Click to expand it.
ParLib.src/CMakeLists.txt
+
21
−
9
View file @
bb8a56e9
add_library
(
plutils STATIC
plutils/plutils.c plutils/plutils.h
)
add_library
(
plutils STATIC
""
)
INCLUDE
(
plutils/CMakeLists.txt
)
INCLUDE
(
plutils/CMakeLists.txt
)
if
(
BUILD_SHARED_LIBS
)
if
(
BUILD_SHARED_LIBS
)
add_library
(
parlibc-shared SHARED
add_library
(
parlibc-shared SHARED
""
)
target_sources
(
parlibc-shared
PRIVATE
parlib.c
parlib.c
bexchange.c
bexchange.c
transpose.c
transpose.c
PUBLIC
parlib.h
)
parlib.h
)
target_include_directories
(
parlibc-shared
target_include_directories
(
parlibc-shared
...
@@ -32,11 +35,14 @@ endif(BUILD_SHARED_LIBS)
...
@@ -32,11 +35,14 @@ endif(BUILD_SHARED_LIBS)
if
(
BUILD_STATIC_LIBS
)
if
(
BUILD_STATIC_LIBS
)
add_library
(
parlibc-static STATIC
add_library
(
parlibc-static STATIC
""
)
parlib.c
target_sources
(
parlibc-static
bexchange.c
PRIVATE
transpose.c
parlib.c
parlib.h
)
bexchange.c
transpose.c
PUBLIC
parlib.h
)
set_target_properties
(
parlibc-static
set_target_properties
(
parlibc-static
PROPERTIES
PROPERTIES
POSITION_INDEPENDENT_CODE 1
POSITION_INDEPENDENT_CODE 1
...
@@ -70,11 +76,14 @@ if(BUILD_STATIC_LIBS)
...
@@ -70,11 +76,14 @@ if(BUILD_STATIC_LIBS)
FortranCInterface_HEADER
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/FC.h MACRO_NAMESPACE
"FC_"
)
FortranCInterface_HEADER
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/FC.h MACRO_NAMESPACE
"FC_"
)
message
(
STATUS
"FORTRAN_C_INTEFACE TEST:
${
FortranCInterface_VERIFIED_C
}
"
)
message
(
STATUS
"FORTRAN_C_INTEFACE TEST:
${
FortranCInterface_VERIFIED_C
}
"
)
add_definitions
(
-DFC_MANGLE=1
)
add_definitions
(
-DFC_MANGLE=1
)
add_library
(
parlibf-static STATIC
add_library
(
parlibf-static STATIC
""
)
target_sources
(
parlibf-static
PRIVATE
parlibf.c
parlibf.c
bexchangef.c
bexchangef.c
transposef.c
transposef.c
FC.h
FC.h
PUBLIC
parlibf.h
)
parlibf.h
)
target_link_libraries
(
parlibf-static
target_link_libraries
(
parlibf-static
...
@@ -96,11 +105,14 @@ if(BUILD_STATIC_LIBS)
...
@@ -96,11 +105,14 @@ if(BUILD_STATIC_LIBS)
)
)
endif
(
BUILD_STATIC_LIBS
)
endif
(
BUILD_STATIC_LIBS
)
if
(
BUILD_SHARED_LIBS
)
if
(
BUILD_SHARED_LIBS
)
add_library
(
parlibf-shared SHARED
add_library
(
parlibf-shared SHARED
""
)
target_sources
(
parlibf-shared
PRIVATE
parlibf.c
parlibf.c
bexchangef.c
bexchangef.c
transposef.c
transposef.c
FC.h
FC.h
PUBLIC
parlibf.h
)
parlibf.h
)
target_link_libraries
(
parlibf-shared
target_link_libraries
(
parlibf-shared
...
...
This diff is collapsed.
Click to expand it.
ParLib.src/plutils/CMakeLists.txt
+
6
−
6
View file @
bb8a56e9
#
target_sources(plutils
target_sources
(
plutils
#
P
UBLIC
P
RIVATE
#
${CMAKE_CURRENT_LIST_DIR}/plutils.c
${
CMAKE_CURRENT_LIST_DIR
}
/plutils.c
#
P
RIVATE
P
UBLIC
#
${CMAKE_CURRENT_LIST_DIR}/plutils.h
${
CMAKE_CURRENT_LIST_DIR
}
/plutils.h
#
)
)
include_directories
(
plutils
include_directories
(
plutils
PUBLIC
${
CMAKE_CURRENT_LIST_DIR
}
)
PUBLIC
${
CMAKE_CURRENT_LIST_DIR
}
)
\ No newline at end of file
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