Skip to content

Commit

Permalink
sorted out de-boost build on linux, fixes #241
Browse files Browse the repository at this point in the history
  • Loading branch information
evgueni-ovtchinnikov committed Jul 26, 2021
1 parent ee4d0a8 commit 898dcea
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/Synergistic/cSyn/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
SET(CMAKE_POSITION_INDEPENDENT_CODE True)

ADD_EXECUTABLE(test_conv_img test_conv_img.cpp ${STIR_REGISTRIES})
TARGET_LINK_LIBRARIES(test_conv_img LINK_PUBLIC csirf iutilities cstir cgadgetron Reg csyn)
TARGET_LINK_LIBRARIES(test_conv_img LINK_PUBLIC cgadgetron csirf iutilities cstir Reg csyn)
INSTALL(TARGETS test_conv_img DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)

set(MR_vendor_dicom_as_nifti "${CMAKE_SOURCE_DIR}/data/examples/MR/zenodo/dicom_as_nifti.nii")
Expand Down
2 changes: 1 addition & 1 deletion src/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE True)

set(cSIRF_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")

add_library(csirf csirf.cpp ImageData.cpp GeometricalInfo.cpp)
add_library(csirf csirf.cpp ImageData.cpp GeometricalInfo.cpp iequals.cpp)
target_include_directories(csirf PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>$<INSTALL_INTERFACE:include>"
)
Expand Down
13 changes: 0 additions & 13 deletions src/common/csirf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,6 @@ limitations under the License.
#include "sirf/Syn/utilities.h"
#include "sirf/common/deprecate.h"

namespace sirf {
bool iequals(const std::string& a, const std::string& b)
{
unsigned int n = a.size();
if (b.size() != n)
return false;
for (unsigned int i = 0; i < n; i++)
if (tolower(a[i]) != tolower(b[i]))
return false;
return true;
}
}

using namespace sirf;

#define NEW_OBJECT_HANDLE(T) new ObjectHandle<T >(shared_ptr<T >(new T))
Expand Down
16 changes: 16 additions & 0 deletions src/common/iequals.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#include <cctype>
#include <string>

namespace sirf {
bool iequals(const std::string& a, const std::string& b)
{
unsigned int n = a.size();
if (b.size() != n)
return false;
for (unsigned int i = 0; i < n; i++)
if (tolower(a[i]) != tolower(b[i]))
return false;
return true;
}
}

0 comments on commit 898dcea

Please sign in to comment.