Fix MSVC build error and update CMake configuration

beutlich · Oct 27, 2024 · b913ec9 · b913ec9
1 parent a942b87
commit b913ec9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Modelica/Resources/BuildProjects/CMake/src.cmake b/Modelica/Resources/BuildProjects/CMake/src.cmake
@@ -70,9 +70,13 @@ set(EXTC_SOURCES
   "${MODELICA_SOURCE_DIR}/ModelicaRandom.h"
   "${MODELICA_SOURCE_DIR}/ModelicaStrings.c"
   "${MODELICA_SOURCE_DIR}/ModelicaStrings.h"
+  "${MODELICA_SOURCE_DIR}/ModelicaTime.c"
+  "${MODELICA_SOURCE_DIR}/ModelicaTime.h"
   "${MODELICA_SOURCE_DIR}/gconstructor.h"
+  "${MODELICA_SOURCE_DIR}/repl_str.h"
   "${MODELICA_SOURCE_DIR}/stdint_msvc.h"
   "${MODELICA_SOURCE_DIR}/stdint_wrap.h"
+  "${MODELICA_SOURCE_DIR}/strptime.h"
   "${MODELICA_SOURCE_DIR}/uthash.h"
   "${MODELICA_SOURCE_DIR}/win32_dirent.c"
   "${MODELICA_SOURCE_DIR}/win32_dirent.h"

diff --git a/Modelica/Resources/BuildProjects/CMake/test.cmake b/Modelica/Resources/BuildProjects/CMake/test.cmake
@@ -7,6 +7,7 @@ if(BUILD_TESTING)
     set(MODELICA_TESTS
       FileSystem
       ModelicaStrings
+      ModelicaTime
       Streams
       Tables
       TablesFromCsvFile

diff --git a/Modelica/Resources/C-Sources/ModelicaTime.c b/Modelica/Resources/C-Sources/ModelicaTime.c
@@ -29,11 +29,6 @@
    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-// TODO: Remove when ModelicaTime.c will become part of ModelicaExternalC
-#if defined(DYMOSIM)
-#pragma once
-#endif
-
 #include "ModelicaTime.h"
 #include "ModelicaUtilities.h"
 #include "strptime.h"

diff --git a/Modelica/Resources/C-Sources/ModelicaTime.h b/Modelica/Resources/C-Sources/ModelicaTime.h
@@ -1,6 +1,6 @@
 /* ModelicaTime.h - External functions header for Modelica.Utilities.Time
 
-   Copyright (C) 2020, Modelica Association and contributors
+   Copyright (C) 2020-2024, Modelica Association and contributors
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,8 @@
 #ifndef MODELICA_TIME_H_
 #define MODELICA_TIME_H_
 
+#include <stdlib.h>
+
 #if !defined(MODELICA_EXPORT)
 #if defined(__cplusplus)
 #define MODELICA_EXPORT extern "C"