Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
iwr
amdis
Commits
b01cb5e6
Commit
b01cb5e6
authored
Oct 26, 2016
by
Praetorius, Simon
Browse files
set properties for debug targets correctly
parent
59a9d7d5
Changes
6
Hide whitespace changes
Inline
Side-by-side
AMDiS/CMakeLists.txt
View file @
b01cb5e6
...
...
@@ -44,11 +44,10 @@ endif (MSVC)
# parallel of sequential version
if
(
ENABLE_PARALLEL_DOMAIN
)
set
(
_
POSTFIX
"-p"
)
set
(
POSTFIX
"-p"
)
else
()
set
(
_
POSTFIX
"-s"
)
set
(
POSTFIX
"-s"
)
endif
()
set
(
POSTFIX
"
${
_POSTFIX
}
$<$<CONFIG:Debug>:d>"
)
# ------------------------------------------------------------------------------
...
...
AMDiS/cmake/CMakeLists.txt
View file @
b01cb5e6
...
...
@@ -195,7 +195,8 @@ if (ENABLE_EXTENSIONS)
include
(
amdis_extensions
)
add_library
(
amdis_extensions
${
EXTENSIONS_SRC
}
)
set_target_properties
(
amdis_extensions PROPERTIES OUTPUT_NAME amdisextensions
${
POSTFIX
}
)
set_target_properties
(
amdis_extensions PROPERTIES OUTPUT_NAME amdisextensions
${
POSTFIX
}
DEBUG_OUTPUT_NAME amdisextensions
${
POSTFIX
}
d
)
install
(
TARGETS amdis_extensions DESTINATION lib/amdis/
)
endif
(
ENABLE_EXTENSIONS
)
...
...
@@ -203,7 +204,8 @@ if (ENABLE_REINIT)
include
(
amdis_reinit
)
add_library
(
amdis_reinit
${
REINIT_SRC
}
)
set_target_properties
(
amdis_reinit PROPERTIES OUTPUT_NAME amdisreinit
${
POSTFIX
}
)
set_target_properties
(
amdis_reinit PROPERTIES OUTPUT_NAME amdisreinit
${
POSTFIX
}
DEBUG_OUTPUT_NAME amdisreinit
${
POSTFIX
}
d
)
install
(
TARGETS amdis_reinit DESTINATION lib/amdis/
)
endif
(
ENABLE_REINIT
)
...
...
@@ -211,7 +213,8 @@ if (ENABLE_COMPOSITE_FEM)
include
(
amdis_compositeFEM
)
add_library
(
amdis_compositeFEM
${
COMPOSITE_FEM_SRC
}
)
set_target_properties
(
amdis_compositeFEM PROPERTIES OUTPUT_NAME amdiscompositefem
${
POSTFIX
}
)
set_target_properties
(
amdis_compositeFEM PROPERTIES OUTPUT_NAME amdiscompositefem
${
POSTFIX
}
DEBUG_OUTPUT_NAME amdiscompositefem
${
POSTFIX
}
d
)
install
(
TARGETS amdis_compositeFEM DESTINATION lib/amdis/
)
endif
(
ENABLE_COMPOSITE_FEM
)
...
...
@@ -252,7 +255,8 @@ install(DIRECTORY ${BASE_DIR}/lib/mtl4/ DESTINATION include/amdis/mtl4/
PATTERN
"mtl4/libs"
EXCLUDE
PATTERN
"mtl4/extern"
EXCLUDE
)
set_target_properties
(
amdis PROPERTIES OUTPUT_NAME amdis
${
POSTFIX
}
)
set_target_properties
(
amdis PROPERTIES OUTPUT_NAME amdis
${
POSTFIX
}
DEBUG_OUTPUT_NAME amdis
${
POSTFIX
}
d
)
install
(
TARGETS amdis DESTINATION lib/amdis/
)
...
...
@@ -267,10 +271,10 @@ configure_file(${BASE_DIR}/cmake/AMDISConfig.cmake.in
# component configuration
configure_file
(
${
BASE_DIR
}
/cmake/AMDIS.cmake.in
${
AMDiS_BINARY_DIR
}
/AMDIS
${
_
POSTFIX
}
.cmake
${
AMDiS_BINARY_DIR
}
/AMDIS
${
POSTFIX
}
.cmake
@ONLY
)
install
(
FILES
${
AMDiS_BINARY_DIR
}
/AMDISConfig.cmake DESTINATION share/amdis/
)
install
(
FILES
${
AMDiS_BINARY_DIR
}
/AMDIS
${
_
POSTFIX
}
.cmake DESTINATION share/amdis/
)
install
(
FILES
${
AMDiS_BINARY_DIR
}
/AMDIS
${
POSTFIX
}
.cmake DESTINATION share/amdis/
)
install
(
FILES
${
BASE_DIR
}
/cmake3/AMDISUse.cmake DESTINATION share/amdis/
)
AMDiS/cmake3/CMakeLists.txt
View file @
b01cb5e6
...
...
@@ -224,7 +224,8 @@ install(DIRECTORY ${BASE_DIR}/lib/mtl4/ DESTINATION include/amdis/mtl4/
PATTERN
"mtl4/libs"
EXCLUDE
PATTERN
"mtl4/extern"
EXCLUDE
)
set_target_properties
(
amdis PROPERTIES OUTPUT_NAME amdis
${
POSTFIX
}
)
set_target_properties
(
amdis PROPERTIES OUTPUT_NAME amdis
${
POSTFIX
}
DEBUG_OUTPUT_NAME amdis
${
POSTFIX
}
d
)
install
(
TARGETS amdis DESTINATION lib/amdis/
)
# generate configuration file:
...
...
@@ -238,10 +239,10 @@ configure_file(${BASE_DIR}/cmake3/AMDISConfig.cmake.in
# component configuration
configure_file
(
${
BASE_DIR
}
/cmake3/AMDIS.cmake.in
${
AMDiS_BINARY_DIR
}
/AMDIS
${
_
POSTFIX
}
.cmake
${
AMDiS_BINARY_DIR
}
/AMDIS
${
POSTFIX
}
.cmake
@ONLY
)
install
(
FILES
${
AMDiS_BINARY_DIR
}
/AMDISConfig.cmake DESTINATION share/amdis/
)
install
(
FILES
${
AMDiS_BINARY_DIR
}
/AMDIS
${
_
POSTFIX
}
.cmake DESTINATION share/amdis/
)
install
(
FILES
${
AMDiS_BINARY_DIR
}
/AMDIS
${
POSTFIX
}
.cmake DESTINATION share/amdis/
)
install
(
FILES
${
BASE_DIR
}
/cmake3/AMDISUse.cmake DESTINATION share/amdis/
)
AMDiS/cmake3/amdis_compositeFEM.cmake
View file @
b01cb5e6
...
...
@@ -24,5 +24,6 @@ target_link_libraries(amdis_compositeFEM amdis)
file
(
GLOB COMPOSITE_HEADERS
"
${
COMPOSITE_SOURCE_DIR
}
/*.h*"
)
install
(
FILES
${
COMPOSITE_HEADERS
}
DESTINATION include/amdis/compositeFEM
)
set_target_properties
(
amdis_compositeFEM PROPERTIES OUTPUT_NAME amdiscompositefem
${
POSTFIX
}
)
set_target_properties
(
amdis_compositeFEM PROPERTIES OUTPUT_NAME amdiscompositefem
${
POSTFIX
}
DEBUG_OUTPUT_NAME amdiscompositefem
${
POSTFIX
}
d
)
install
(
TARGETS amdis_compositeFEM DESTINATION lib/amdis/
)
AMDiS/cmake3/amdis_extensions.cmake
View file @
b01cb5e6
...
...
@@ -94,7 +94,8 @@ if (ENABLE_EXTENSIONS)
file
(
GLOB HEADERS
"
${
EXTENSIONS_DIR
}
/pugixml/src/*.hpp"
)
install
(
FILES
${
HEADERS
}
DESTINATION include/amdis/extensions/pugixml/
)
set_target_properties
(
amdis_extensions PROPERTIES OUTPUT_NAME amdisextensions
${
POSTFIX
}
)
set_target_properties
(
amdis_extensions PROPERTIES OUTPUT_NAME amdisextensions
${
POSTFIX
}
DEBUG_OUTPUT_NAME amdisextensions
${
POSTFIX
}
d
)
install
(
TARGETS amdis_extensions DESTINATION lib/amdis/
)
endif
(
EXTENSIONS_DIR
)
...
...
AMDiS/cmake3/amdis_reinit.cmake
View file @
b01cb5e6
...
...
@@ -19,5 +19,6 @@ file(GLOB RINIT_HEADERS "${REINIT_SOURCE_DIR}/*.h*")
install
(
FILES
${
RINIT_HEADERS
}
DESTINATION include/amdis/reinit
)
set_target_properties
(
amdis_reinit PROPERTIES OUTPUT_NAME amdisreinit
${
POSTFIX
}
)
set_target_properties
(
amdis_reinit PROPERTIES OUTPUT_NAME amdisreinit
${
POSTFIX
}
DEBUG_OUTPUT_NAME amdisreinit
${
POSTFIX
}
d
)
install
(
TARGETS amdis_reinit DESTINATION lib/amdis/
)
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