Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
simc-file-input
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
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
jlab
simc-file-input
Commits
535e0bf3
Commit
535e0bf3
authored
6 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Patches
Plain Diff
streamlined CMAKE setup
parent
36aba81a
No related branches found
No related tags found
No related merge requests found
Pipeline
#1549
failed
6 years ago
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+1
-7
1 addition, 7 deletions
CMakeLists.txt
CTP/CMakeLists.txt
+4
-4
4 additions, 4 deletions
CTP/CMakeLists.txt
cmake/simc-config-version.cmake.in
+1
-1
1 addition, 1 deletion
cmake/simc-config-version.cmake.in
with
6 additions
and
12 deletions
CMakeLists.txt
+
1
−
7
View file @
535e0bf3
...
...
@@ -4,13 +4,7 @@
## PROJECT: SIMC (Cmake build with file input)
################################################################################
cmake_minimum_required
(
VERSION 3.5
)
project
(
simc
)
set
(
SIMC_MAJOR_VERSION 0
)
set
(
SIMC_MINOR_VERSION 2
)
set
(
SIMC_PATCH_VERSION 0
)
set
(
SIMC_VERSION
${
SIMC_MAJOR_VERSION
}
.
${
SIMC_MINOR_VERSION
}
.
${
SIMC_PATCH_VERSION
}
)
set
(
SIMC_SOVERSION
${
SIMC_MAJOR_VERSION
}
)
project
(
simc VERSION 1.0.0
)
################################################################################
## CMAKE Settings
...
...
This diff is collapsed.
Click to expand it.
CTP/CMakeLists.txt
+
4
−
4
View file @
535e0bf3
...
...
@@ -74,15 +74,15 @@ add_library(${LIBRARY} STATIC
${
CTP_SOURCES
}
${
RPC_SVC_SOURCE
}
${
RPC_XDR_SOURCE
}
${
RPC_HEADER
}
)
set_target_properties
(
${
LIBRARY
}
PROPERTIES
VERSION
${
SIMC
_VERSION
}
SOVERSION
${
SIMC_SO
VERSION
}
)
VERSION
${
PROJECT
_VERSION
}
SOVERSION
${
PROJECT_MAJOR_
VERSION
}
)
add_library
(
${
CLIENT_LIBRARY
}
STATIC
${
CLIENT_SOURCES
}
${
RPC_CLNT_SOURCE
}
${
RPC_XDR_SOURCE
}
${
RPC_HEADER
}
)
set_target_properties
(
${
LIBRARY
}
PROPERTIES
VERSION
${
SIMC
_VERSION
}
SOVERSION
${
SIMC_SO
VERSION
}
)
VERSION
${
PROJECT
_VERSION
}
SOVERSION
${
PROJECT_MAJOR_
VERSION
}
)
add_executable
(
${
PROGRAM
}
${
MAKEREG_SOURCES
}
)
target_link_libraries
(
${
PROGRAM
}
...
...
This diff is collapsed.
Click to expand it.
cmake/simc-config-version.cmake.in
+
1
−
1
View file @
535e0bf3
set(PACKAGE_VERSION "@
SIMC
_VERSION@")
set(PACKAGE_VERSION "@
PROJECT
_VERSION@")
# Check whether the requested PACKAGE_FIND_VERSION is compatible
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
...
...
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