Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
IP
elsa
Commits
46ba32aa
Commit
46ba32aa
authored
Jan 15, 2020
by
Tobias Lasser
Browse files
Fix cmake config file install path (
#37
)
parent
0fdbde8b
Pipeline
#205512
passed with stages
in 5 minutes and 9 seconds
Changes
3
Pipelines
8
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
46ba32aa
...
...
@@ -42,9 +42,6 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
set
(
DEFAULT_BUILD_TYPE
"Release"
)
include
(
SetDefaultBuildType
)
# set where to install the exports/targets
set
(
INSTALL_CONFIG_DIR
${
CMAKE_INSTALL_LIBDIR
}
/cmake
)
# ------------ dependencies ------------
# ------------
...
...
@@ -70,6 +67,13 @@ else()
message
(
STATUS
" No dependencies added for elsa, as it is not stand-alone"
)
endif
()
# set where to install the exports/targets
include
(
GNUInstallDirs
)
include
(
CMakePackageConfigHelpers
)
set
(
INSTALL_CONFIG_DIR
${
CMAKE_INSTALL_LIBDIR
}
/cmake/elsa
)
# include the InstallElsaModule function
include
(
InstallElsaModule
)
...
...
elsa/CMakeLists.txt
View file @
46ba32aa
...
...
@@ -74,15 +74,13 @@ install(FILES elsa.h
if
(
${
ELSA_MASTER_PROJECT
}
AND
${
ELSA_BUILD_WITH_MORE_WARNINGS
}
)
list
(
REMOVE_ITEM ELSA_REGISTERED_COMPONENTS
""
)
foreach
(
_component
${
ELSA_REGISTERED_COMPONENTS
}
)
if
(
CMAKE_CXX_COMPILER_ID MATCHES
"GNU|Clang|AppleClang"
)
target_compile_options
(
elsa_
${
_component
}
PUBLIC -Wall -Wextra -Wconversion -pedantic -Wfatal-errors
)
endif
()
if
(
CMAKE_CXX_COMPILER_ID MATCHES
"MSVC"
)
target_compile_options
(
elsa_
${
_component
}
PUBLIC /W3 /WX
)
if
(
NOT
(
_component MATCHES
"projector_kernels"
))
if
(
CMAKE_CXX_COMPILER_ID MATCHES
"GNU|Clang|AppleClang"
)
target_compile_options
(
elsa_
${
_component
}
PUBLIC -Wall -Wextra -Wconversion -pedantic -Wfatal-errors
)
endif
()
if
(
CMAKE_CXX_COMPILER_ID MATCHES
"MSVC"
)
target_compile_options
(
elsa_
${
_component
}
PUBLIC /W3 /WX
)
endif
()
endif
()
endforeach
(
_component ELSA_REGISTERED_COMPONENTS
)
endif
()
# propagate the variable to the parent scope
set
(
ELSA_REGISTERED_COMPONENTS
"
${
ELSA_REGISTERED_COMPONENTS
}
;all;"
PARENT_SCOPE
)
elsa/projectors_cuda/projector_kernels/CMakeLists.txt
View file @
46ba32aa
...
...
@@ -112,5 +112,8 @@ target_include_directories(${ELSA_MODULE_TARGET_NAME} PUBLIC
$<INSTALL_INTERFACE:include/elsa/
${
ELSA_MODULE_NAME
}
>
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
>
)
# register the module
registerComponent
(
${
ELSA_MODULE_NAME
}
)
# install the kernels as a module
InstallElsaModule
(
${
ELSA_MODULE_NAME
}
${
ELSA_MODULE_TARGET_NAME
}
${
ELSA_MODULE_EXPORT_TARGET
}
)
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment