update cmake file for aaplus

hvanruys · Mar 1, 2024 · 0c61fad · 0c61fad
1 parent 429af3f
commit 0c61fad
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/aaplus/AAVSOP2013.cpp b/aaplus/AAVSOP2013.cpp
@@ -238,7 +238,7 @@ bool CAAVSOP2013EphemeridesFile::WriteBinaryFile(const std::filesystem::path::va
 #ifdef _MSC_VER
   if (_wfopen_s(&f, pszFilename, L"wb") != 0)
 #else
-  f = fopen(pszFilename, "wb");
+  f = fopen((const char *)pszFilename, "wb");
   if (f == nullptr)
 #endif //#ifdef _MSC_VER
     return false;
@@ -280,7 +280,7 @@ bool CAAVSOP2013EphemeridesFile::ReadBinaryFile(const std::filesystem::path::val
 #ifdef _MSC_VER
   if (_wfopen_s(&f, pszFilename, L"rb") != 0)
 #else
-  f = fopen(pszFilename, "rb");
+  f = fopen((const char *)pszFilename, "rb");
   if (f == nullptr)
 #endif //#ifdef _MSC_VER
     return false;
@@ -411,7 +411,7 @@ bool CAAVSOP2013ElementsFile::WriteBinaryFile(const std::filesystem::path::value
 #ifdef _MSC_VER
   if (_wfopen_s(&f, pszFilename, L"wb") != 0)
 #else
-  f = fopen(pszFilename, "wb");
+  f = fopen((const char *)pszFilename, "wb");
   if (f == nullptr)
 #endif //#ifdef _MSC_VER
     return false;
@@ -465,7 +465,7 @@ bool CAAVSOP2013ElementsFile::ReadBinaryFile(const std::filesystem::path::value_
 #ifdef _MSC_VER
   if (_wfopen_s(&f, pszFilename, L"rb") != 0)
 #else
-  f = fopen(pszFilename, "rb");
+  f = fopen((const char *)pszFilename, "rb");
   if (f == nullptr)
 #endif //#ifdef _MSC_VER
     return false;

diff --git a/aaplus/CMakeLists.txt b/aaplus/CMakeLists.txt
@@ -267,9 +267,15 @@ ADD_EXECUTABLE(AATest ${SRCS} )
 #-----------------------------------------------------------------------------
 # Libraries.
 ADD_LIBRARY(aaplus-static STATIC ${SRCS_LIB} ${INCS})
+if(WIN32)
+    target_link_libraries(aaplus-static ws2_32)
+endif(WIN32)
 SET_TARGET_PROPERTIES(aaplus-static PROPERTIES OUTPUT_NAME "aaplus")
 
 ADD_LIBRARY(aaplus-shared SHARED ${SRCS_LIB} ${INCS})
+if(WIN32)
+    target_link_libraries(aaplus-shared ws2_32)
+endif(WIN32)
 SET_TARGET_PROPERTIES(aaplus-shared PROPERTIES OUTPUT_NAME "aaplus")
 
 install(TARGETS aaplus-shared aaplus-static 

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -149,9 +149,13 @@ target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_SOURCE_DIR}/aaplus")
 
 add_definitions(-DHDF5_DISABLE_VERSION_CHECK=1 -DOPENGL30)
 # sequence of libraries is important !
+if(WIN32)
+target_link_libraries(${PROJECT_NAME} z pthread Qt5::Widgets Qt5::Gui Qt5::Core Qt5::Widgets Qt5::Xml Qt5::Concurrent Qt5::Network Qt5::PrintSupport
+    my_compiler_flags_1 meteosatlib QSgp4 bz2 JPEG T4 WT DISE COMP ${HDF5_LINK_LIBRARIES} ${NETCDF_LINK_LIBRARIES} archive freeimage aaplus-static ws2_32)
+else()
 target_link_libraries(${PROJECT_NAME} z pthread Qt5::Widgets Qt5::Gui Qt5::Core Qt5::Widgets Qt5::Xml Qt5::Concurrent Qt5::Network Qt5::PrintSupport
     my_compiler_flags_1 meteosatlib QSgp4 bz2 JPEG T4 WT DISE COMP ${HDF5_LINK_LIBRARIES} ${NETCDF_LINK_LIBRARIES} archive freeimage aaplus-static)
-
+endif()
 #set_target_properties(${PROJECT_NAME}
 #  PROPERTIES
 #    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib

diff --git a/core/formtoolbox.cpp b/core/formtoolbox.cpp
@@ -647,7 +647,7 @@ void FormToolbox::setupChannelGeoCombo(int index)
     ui->comboGeo16->clear();
 
 
-    if(index == 0 || index == 1 || index == 2 || index == 3)
+    if(index == 0 || index == 2 || index == 3)
     {
         ui->comboGeo1->addItems(coloritems);
         ui->comboGeo2->addItems(coloritems);

diff --git a/core/segmentlistgeostationary.cpp b/core/segmentlistgeostationary.cpp
@@ -11,8 +11,6 @@
    (Written by Greg McGarragh and Simon Proud)
 
    ------------------------------------------------------------------ */
-
-
 #include <QApplication>
 #include <QFuture>
 #include <QtConcurrent/QtConcurrent>