Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Institute of Technical Acoustics (ITA)
ITABase
Commits
7772ff74
Commit
7772ff74
authored
Jan 06, 2017
by
Dipl.-Ing. Jonas Stienen
Browse files
More fixes for CMake config. Removed conversion warning.
parent
e902c364
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
7772ff74
...
...
@@ -152,14 +152,16 @@ if( ITA_BASE_WITH_OLD_ATOMICS )
endif
()
if
(
ITA_BASE_WITH_OLD_RAVEN_OPS
)
if
(
NOT ITA_BASE_WITH_CONFIG_OLD_IMPL
)
message
(
FATAL_ERROR
"ITABase old RAVEN ops requires regular expressions and old config implementation. Please activate."
)
endif
()
set
(
ITABaseHeader
"
${
ITABaseHeader
}
"
"include/ITAOps.h"
)
set
(
ITABaseSources
"
${
ITABaseSources
}
"
"src/ITAOps.cpp"
)
endif
()
if
(
VPCRE_FOUND AND ITA_BASE_WITH_REGULAR_EXPRESSIONS
)
add_definitions
(
-DPCRE_STATIC
)
list
(
APPEND ITABaseHeader
"include/ITAConfigUtils.h"
)
list
(
APPEND ITABaseSources
"src/ITAStringUtilsPCRE.cpp"
"src/ITAConfigUtils.cpp"
)
list
(
APPEND ITABaseSources
"src/ITAStringUtilsPCRE.cpp"
)
else
()
list
(
APPEND ITABaseSources
"src/ITAStringUtils.cpp"
)
endif
()
...
...
@@ -170,7 +172,8 @@ if( ITA_BASE_WITH_CONFIG_OLD_IMPL AND NOT ITA_BASE_WITH_CONFIG_SIMPLE_INI )
if
(
NOT ITA_BASE_WITH_REGULAR_EXPRESSIONS
)
message
(
FATAL_ERROR
"ITABase old config implementation requires regular expressions. Please activate."
)
endif
()
list
(
APPEND ITABaseSources
"src/ITAConfigUtilsWin32Impl.cpp"
)
list
(
APPEND ITABaseHeader
"include/ITAConfigUtils.h"
)
list
(
APPEND ITABaseSources
"src/ITAConfigUtils.cpp"
"src/ITAConfigUtilsWin32Impl.cpp"
)
endif
()
...
...
src/ITAHDFTSpectra.cpp
View file @
7772ff74
...
...
@@ -52,7 +52,7 @@ float ITAHDFTSpectra::GetMaxEnergy( int* piIdx ) const
if
(
fEnergyTemp
>
fEnergyMax
)
{
fEnergyMax
=
fEnergyTemp
;
*
piIdx
=
n
;
*
piIdx
=
int
(
n
)
;
}
}
...
...
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