fix vcpkg

Author: reem-codes

data_structure/CMakeLists.txt

@@ -8,7 +8,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0")
 ############ Dependencies
 
 find_package (Threads REQUIRED)
-#find_package(Boost)
 find_package(TBB CONFIG REQUIRED)
 
 ############## Default target to build
@@ -62,9 +61,12 @@ add_library( lactea_xp_merged ${LACTEAXP_MERGE_SRC_FILES}
 		src/utils/portable_io.cpp
 		)
 target_link_libraries(lactea_xp_merged
-		TBB::tbb
 		Threads::Threads
 		)
+# Link TBB only on non-Windows systems
+if(NOT WIN32)
+	target_link_libraries(lactea_xp_merged TBB::tbb)
+endif()
 
 #### Star sorter XP MERGED
 add_executable( lactea_raw_star_db_sorter_xp_merged

data_structure/src/lactea_xp_merged/light_spectrum.cpp

@@ -43,9 +43,9 @@ const double* LightSpectrum::getHistogram() const { return _histogram; }
 
 bool LightSpectrum::addFlux(const double b[], const double azero)
 {
-    double a0 = std::max(azero, 0.);
+    double a0 = fmax(azero, 0.);
     for (int i = 0; i < LIGHTSPECTRUM_NUM_BINS_BASE; ++i) {
-        double f = std::max(b[i], 0.);
+        double f = fmax(b[i], 0.);
         this->_histogram[i] += f;
         this->_histogram[LIGHTSPECTRUM_TOTAL_ENERGY_INDEX] += f;
         double corrected = f * pow(10, 0.4 * a0 * EXTINCTION_CURVE[i] / 3.1);
@@ -57,16 +57,16 @@ bool LightSpectrum::addFlux(const double b[], const double azero)
 
 bool LightSpectrum::addPhotometry(double rp, double g, double bp)
 {
-    this->_histogram[LIGHTSPECTRUM_RP_INDEX] += std::max(rp, 0.);
-    this->_histogram[LIGHTSPECTRUM_G_INDEX] += std::max(g, 0.);
-    this->_histogram[LIGHTSPECTRUM_BP_INDEX] += std::max(bp, 0.);
+    this->_histogram[LIGHTSPECTRUM_RP_INDEX] += fmax(rp, 0.);
+    this->_histogram[LIGHTSPECTRUM_G_INDEX] += fmax(g, 0.);
+    this->_histogram[LIGHTSPECTRUM_BP_INDEX] += fmax(bp, 0.);
     return true;
 }
 
 
 bool LightSpectrum::addTemperature(double temperature)
 {
-    this->_histogram[LIGHTSPECTRUM_TEMPERATURE_INDEX] += std::max(temperature, 0.);
+    this->_histogram[LIGHTSPECTRUM_TEMPERATURE_INDEX] += fmax(temperature, 0.);
     this->_histogram[LIGHTSPECTRUM_TEMPERATURE_COUNT_INDEX] += temperature > 0;
     return true;
 }
@@ -76,22 +76,22 @@ LightSpectrum LightSpectrum::operator+(const LightSpectrum& b)
 {
     LightSpectrum ls;
     for (int i = 0; i < LIGHTSPECTRUM_NUM_BINS_TOTAL; ++i)
-        ls._histogram[i] = std::max(this->_histogram[i] + b._histogram[i], 0.);
+        ls._histogram[i] = fmax(this->_histogram[i] + b._histogram[i], 0.);
     return ls;
 }
 
 LightSpectrum LightSpectrum::operator-(const LightSpectrum& b)
 {
     LightSpectrum ls;
     for (int i = 0; i < LIGHTSPECTRUM_NUM_BINS_TOTAL; ++i)
-        ls._histogram[i] = std::max(0., this->_histogram[i] - b._histogram[i]);
+        ls._histogram[i] = fmax(0., this->_histogram[i] - b._histogram[i]);
     return ls;
 }
 
 LightSpectrum & LightSpectrum::operator+=(const LightSpectrum &b)
 {
     for (int i = 0; i < LIGHTSPECTRUM_NUM_BINS_TOTAL; ++i)
-        this->_histogram[i] += std::max(b._histogram[i], 0.);
+        this->_histogram[i] += fmax(b._histogram[i], 0.);
     return *this;
 }