Skip to content

Commit 4333267

Browse files
committed
BUG: Fixes issue with generated cmake files for finding version
The file was not correctly named
1 parent 0211591 commit 4333267

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1515
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
1616

1717
# set project's name
18-
project(EbsdLibProj VERSION 1.0.40)
18+
project(EbsdLibProj VERSION 1.0.41)
1919

2020
# ---------- Setup output Directories -------------------------
2121
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ The [DREAM.3D](https://dream3d.bluequartz.net) project and [DREAM3D-NX](https://
1515
Please have a look at the unit tests for examples on using the various readers.
1616

1717
## Crystallographic Classes
18+
1819
| # | Point Group (H–M) | Rotation Point Group | Space Group No(s). | Schoenflies | Crystal system | Laue class | Laue Ops |
1920
|---:|-------------------|----------------------|--------------------|---------------|----------------|-------------|------------------|
2021
| 1 | 1 | 1 | 1 | C₁ | Triclinic | (\bar{1}) | TriclinicOps |
@@ -55,7 +56,7 @@ Please have a look at the unit tests for examples on using the various readers.
5556

5657
| From/To | Euler | Orientation Matrix | Axis Angle | Rodrigues | Quaternion | Homochoric | Cubochoric | Stereographic |
5758
|--------------------|-------|--------------------|------------|-----------|------------|------------|------------|---------------|
58-
| Euler | - | X | X | X | X | a | ah | q |
59+
| Euler | -- | X | X | X | X | a | ah | q |
5960
| Orientation Matrix | X | -- | X | e | X | a | ah | q |
6061
| Axis Angle | o | X | -- | X | X | X | h | q |
6162
| Rodrigues | o | a | X | -- | a | X | h | q |

Source/EbsdLib/SourceList.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ if(EbsdLib_INSTALL_FILES)
265265
include(CMakePackageConfigHelpers)
266266

267267
write_basic_package_version_file(
268-
"${CMAKE_CURRENT_BINARY_DIR}/EbsdLib/${PROJECT_NAME}TargetsConfigVersion.cmake"
268+
"${CMAKE_CURRENT_BINARY_DIR}/EbsdLib/${PROJECT_NAME}ConfigVersion.cmake"
269269
VERSION ${EbsdLib_VERSION}
270270
COMPATIBILITY AnyNewerVersion
271271
)

Source/Test/ConvertToFundamentalZoneTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ std::vector<std::array<bool, 22>> k_FZValues = {
7070
};
7171
//clang-format on
7272

73-
} // namespace Detail
73+
} // namespace detail
7474

7575
class ConvertToFundamentalZoneTest
7676
{

Source/Test/UnitTestSupport.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -367,12 +367,12 @@ bool AlmostEqualUlpsFinal(float* A, float* B, int maxUlps)
367367

368368
#define DREAM3D_REQUIRE(P) \
369369
{ \
370-
const bool testValue = (P); \
371-
if((testValue) == (false)) \
370+
const bool testValue = (P); \
371+
if((testValue) == (false)) \
372372
{ \
373-
std::string message("Your test required the following\n '"); \
374-
message = message.append(#P).append("'\n but this condition was not met."); \
375-
DREAM3D_TEST_THROW_EXCEPTION(message) \
373+
std::string message("Your test required the following\n '"); \
374+
message = message.append(#P).append("'\n but this condition was not met."); \
375+
DREAM3D_TEST_THROW_EXCEPTION(message) \
376376
} \
377377
}
378378

@@ -420,11 +420,11 @@ bool AlmostEqualUlpsFinal(float* A, float* B, int maxUlps)
420420
#define DREAM3D_REQUIRE_EQUAL(L, R) \
421421
if((L) != (R)) \
422422
{ \
423-
const std::string buf; \
424-
std::stringstream outStream(buf); \
425-
outStream << "Your test required the following\n '"; \
426-
outStream << #L << " == " << #R << "'\n but this condition was not met.\n"; \
427-
outStream << " " << L << "==" << R; \
423+
const std::string buf; \
424+
std::stringstream outStream(buf); \
425+
outStream << "Your test required the following\n '"; \
426+
outStream << #L << " == " << #R << "'\n but this condition was not met.\n"; \
427+
outStream << " " << L << "==" << R; \
428428
DREAM3D_TEST_THROW_EXCEPTION(buf) \
429429
}
430430

0 commit comments

Comments
 (0)