Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
slic
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
Show more breadcrumbs
SLIC_software
slic
Commits
7231e1d8
Commit
7231e1d8
authored
8 years ago
by
Jeremy McCormick
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #40 from slaclab/iss39
Fix LCIO package config
parents
ac154614
68795385
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/FindLCIO.cmake
+9
-0
9 additions, 0 deletions
cmake/FindLCIO.cmake
cmake/InstallLCIO.cmake
+4
-3
4 additions, 3 deletions
cmake/InstallLCIO.cmake
with
13 additions
and
3 deletions
cmake/FindLCIO.cmake
0 → 100644
+
9
−
0
View file @
7231e1d8
find_path
(
LCIO_INCLUDE_DIRS lcio.h
${
LCIO_DIR
}
/include
)
find_library
(
LCIO_LIBRARY lcio
${
LCIO_DIR
}
/lib
)
find_library
(
SIO_LIBRARY sio
${
LCIO_DIR
}
/lib
)
set
(
LCIO_LIBRARIES
${
LCIO_LIBRARY
}
${
SIO_LIBRARY
}
)
include
(
FindPackageHandleStandardArgs
)
find_package_handle_standard_args
(
LCIO DEFAULT_MSG LCIO_LIBRARIES LCIO_INCLUDE_DIRS
)
This diff is collapsed.
Click to expand it.
cmake/InstallLCIO.cmake
+
4
−
3
View file @
7231e1d8
...
@@ -13,9 +13,10 @@ EXTERNALPROJECT_ADD(
...
@@ -13,9 +13,10 @@ EXTERNALPROJECT_ADD(
SOURCE_DIR
"
${
CMAKE_BINARY_DIR
}
/lcio"
SOURCE_DIR
"
${
CMAKE_BINARY_DIR
}
/lcio"
CMAKE_ARGS -DINSTALL_DOC=OFF -DCMAKE_INSTALL_PREFIX=
${
DEPENDENCY_INSTALL_DIR
}
/lcio
CMAKE_ARGS -DINSTALL_DOC=OFF -DCMAKE_INSTALL_PREFIX=
${
DEPENDENCY_INSTALL_DIR
}
/lcio
BUILD_COMMAND make -j4
INSTALL_COMMAND make install COMMAND mkdir
${
DEPENDENCY_INSTALL_DIR
}
/lcio/cmake COMMAND cp
${
CMAKE_BINARY_DIR
}
/lcio/cmake/MacroCheckPackageVersion.cmake
${
DEPENDENCY_INSTALL_DIR
}
/lcio/cmake COMMAND cp
${
CMAKE_BINARY_DIR
}
/lcio/cmake/MacroCheckPackageLibs.cmake
${
DEPENDENCY_INSTALL_DIR
}
/lcio/cmake
)
)
#BUILD_COMMAND make -j4
#INSTALL_COMMAND make install
#COMMAND mkdir ${DEPENDENCY_INSTALL_DIR}/lcio/cmake COMMAND cp ${CMAKE_BINARY_DIR}/lcio/cmake/MacroCheckPackageVersion.cmake ${DEPENDENCY_INSTALL_DIR}/lcio/cmake COMMAND cp ${CMAKE_BINARY_DIR}/lcio/cmake/MacroCheckPackageLibs.cmake ${DEPENDENCY_INSTALL_DIR}/lcio/cmake
SET
(
LCIO_DIR
${
DEPENDENCY_INSTALL_DIR
}
/lcio CACHE PATH
"LCIO install dir"
FORCE
)
SET
(
LCIO_DIR
${
DEPENDENCY_INSTALL_DIR
}
/lcio CACHE PATH
"LCIO install dir"
FORCE
)
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