Skip to content

Commit

Permalink
Replaces all tabs with spaces (#33)
Browse files Browse the repository at this point in the history
* Replaces all tabs with spaces in all .c and .h files in dirs src and Test

* Replaced tabs with spaces in all .cmake files and CMakeLists.txt
  • Loading branch information
modelonrobinandersson authored Apr 5, 2023
1 parent 1fcadaf commit fc8d2eb
Show file tree
Hide file tree
Showing 207 changed files with 12,946 additions and 12,950 deletions.
321 changes: 160 additions & 161 deletions CMakeLists.txt

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions Config.cmake/Minizip/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ set(BUILD_SHARED_LIBS OFF)
set(SKIP_INSTALL_HEADERS ON)
set(SKIP_INSTALL_FILES ON)
if(NOT FMILIB_INSTALL_SUBLIBS)
set(SKIP_INSTALL_LIBRARIES ON)
set(SKIP_INSTALL_LIBRARIES ON)
endif()
add_subdirectory("${FMILIB_THIRDPARTYLIBS}/Zlib/zlib-1.2.6" "${FMILibrary_BINARY_DIR}/zlib")

if(CMAKE_CL_64)
set_target_properties(zlib PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
set_target_properties(zlib PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
endif()

if(CMAKE_HOST_APPLE)
Expand Down Expand Up @@ -46,7 +46,7 @@ endif(WIN32)

set(HEADERS
${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/crypt.h
${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/ioapi.h
${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/ioapi.h
${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/miniunz.h
#${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/mztools.h
${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/unzip.h
Expand All @@ -61,9 +61,8 @@ add_library(minizip ${SOURCE} ${HEADERS})
target_link_libraries(minizip zlib)

if(FMILIB_INSTALL_SUBLIBS)
install(TARGETS minizip
install(TARGETS minizip
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
)
LIBRARY DESTINATION lib
)
endif()

10 changes: 5 additions & 5 deletions Config.cmake/config_fmilib.c.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#include "fmilib_config.h"

const char * fmilib_build_stamp =
"Built on: " __DATE__ " " __TIME__ "\n"
"Last changed on: @FMILibrary_WC_LAST_CHANGED_DATE@\n"
"Revision: @FMILibrary_WC_REVISION@";
"Built on: " __DATE__ " " __TIME__ "\n"
"Last changed on: @FMILibrary_WC_LAST_CHANGED_DATE@\n"
"Revision: @FMILibrary_WC_REVISION@";

const char* fmilib_get_build_stamp(void) {
return fmilib_build_stamp;
return fmilib_build_stamp;
}
30 changes: 15 additions & 15 deletions Config.cmake/config_fmilib.h.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,35 @@
#define CONFIG_FMILIB_H_

/** \file fmilib_config.h
\brief Library configuration file generated by the build system.
\brief Library configuration file generated by the build system.
*/

#ifndef WIN32
#cmakedefine WIN32
#ifdef WIN32
/** \def WIN32
\brief WIN32 is used to identify Windows OS (set on both Win32 and Win64)
\brief WIN32 is used to identify Windows OS (set on both Win32 and Win64)
*/
#endif
#endif

#cmakedefine MINGW
#ifdef MINGW
/** \def MINGW
\brief MINGW is used to identify MSYS/MinGW environment
\brief MINGW is used to identify MSYS/MinGW environment
*/
#endif

#ifndef CMAKE_INTDIR
#define CMAKE_INTDIR "."
/** \def CMAKE_INTDIR
\brief The macro #CMAKE_INTDIR gives intermediate directory for the current configuration (Debug/Release).
\brief The macro #CMAKE_INTDIR gives intermediate directory for the current configuration (Debug/Release).

It is redefined to "." for Makefile based build environments. Otherwise is set by MSVC. */
#endif

/** \brief Platform folder separator */
#define FMI_FILE_SEP "@FMI_FILE_SEP@"
#define FMI_FILE_SEP "@FMI_FILE_SEP@"

/** \brief DLL file name suffix(.so, .dll, ...) */
#define FMI_DLL_EXT "@CMAKE_SHARED_LIBRARY_SUFFIX@"
Expand All @@ -71,14 +71,14 @@ It is redefined to "." for Makefile based build environments. Otherwise is set b
#if 0 /* defined(__GNUC__) MSYS currently does not support visibility attribute */
#define FMILIB_EXPORT __attribute__ ((dllexport))
#else
/* Note: actually gcc seems to also supports this syntax. */
/* Note: actually gcc seems to also supports this syntax. */
#define FMILIB_EXPORT __declspec(dllexport)
#endif
#else
#if 0 /* defined(__GNUC__) MSYS currently does not support visibility attribute */
#define FMILIB_EXPORT __attribute__ ((dllimport))
#else
/* Note: actually gcc seems to also supports this syntax. */
/* Note: actually gcc seems to also supports this syntax. */
#define FMILIB_EXPORT __declspec(dllimport)
#endif
#endif
Expand All @@ -103,9 +103,9 @@ It is redefined to "." for Makefile based build environments. Otherwise is set b
#endif

/** \def FMILIB_EXPORT
\brief Used to declare the public API of the library needed for dynamic linking.
\def FMILIB_PRIVATE
\brief Intended for declaration of the private library functions.
\brief Used to declare the public API of the library needed for dynamic linking.
\def FMILIB_PRIVATE
\brief Intended for declaration of the private library functions.
*/

#cmakedefine FMILIB_ENABLE_LOG_LEVEL_DEBUG
Expand All @@ -120,9 +120,9 @@ It is redefined to "." for Makefile based build environments. Otherwise is set b
*/

#if defined _MSC_VER
#define FMILIB_SIZET_FORMAT "%Iu"
#define FMILIB_SIZET_FORMAT "%Iu"
#else
#define FMILIB_SIZET_FORMAT "%zu"
#define FMILIB_SIZET_FORMAT "%zu"
#endif

#cmakedefine FMILIB_GENERATE_BUILD_STAMP
Expand All @@ -142,9 +142,9 @@ extern "C" {
#endif

/** \brief Get the library build stamp.
\return A string giving SVN revision and build time for the library.
The function is only active if the library was configured with #FMILIB_GENERATE_BUILD_STAMP ON
\return A string giving SVN revision and build time for the library.

The function is only active if the library was configured with #FMILIB_GENERATE_BUILD_STAMP ON
*/
FMILIB_EXPORT const char* fmilib_get_build_stamp(void);
#ifdef __cplusplus
Expand Down
4 changes: 2 additions & 2 deletions Config.cmake/config_stamp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Subversion_WC_INFO(${FMILIBRARYHOME} FMILibrary)

message(STATUS "Generating build timestamp in ${FMILIBRARYBUILD}/config_fmilib.c")
configure_file (
"${FMILIBRARYHOME}/Config.cmake/config_fmilib.c.cmake"
"${FMILIBRARYBUILD}/config_fmilib.c"
"${FMILIBRARYHOME}/Config.cmake/config_fmilib.c.cmake"
"${FMILIBRARYBUILD}/config_fmilib.c"
)
12 changes: 6 additions & 6 deletions Config.cmake/fmicapi.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ set(FMICAPISOURCE
src/FMI3/fmi3_capi.c
)
set(FMICAPIHEADERS
include/FMI1/fmi1_capi.h
src/FMI1/fmi1_capi_impl.h
include/FMI2/fmi2_capi.h
src/FMI2/fmi2_capi_impl.h
include/FMI3/fmi3_capi.h
src/FMI3/fmi3_capi_impl.h
include/FMI1/fmi1_capi.h
src/FMI1/fmi1_capi_impl.h
include/FMI2/fmi2_capi.h
src/FMI2/fmi2_capi_impl.h
include/FMI3/fmi3_capi.h
src/FMI3/fmi3_capi_impl.h
)

include_directories(${FMILIB_FMI_STANDARD_HEADERS})
Expand Down
156 changes: 78 additions & 78 deletions Config.cmake/fmiimport.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,95 +30,95 @@ include_directories(
set(FMIIMPORT_LIBRARIES fmiimport)

set(FMIIMPORT_PUBHEADERS
include/FMI1/fmi1_import.h
include/FMI1/fmi1_import_capi.h
include/FMI1/fmi1_import_capabilities.h
include/FMI1/fmi1_import_cosim.h
include/FMI1/fmi1_import_type.h
include/FMI1/fmi1_import_unit.h
include/FMI1/fmi1_import_variable.h
include/FMI1/fmi1_import_variable_list.h
include/FMI1/fmi1_import_vendor_annotations.h
include/FMI1/fmi1_import_convenience.h

include/FMI2/fmi2_import.h
include/FMI2/fmi2_import_capi.h
include/FMI2/fmi2_import_type.h
include/FMI2/fmi2_import_unit.h
include/FMI2/fmi2_import_variable.h
include/FMI2/fmi2_import_variable_list.h
include/FMI2/fmi2_import_convenience.h

include/FMI3/fmi3_import.h
include/FMI3/fmi3_import_capi.h
include/FMI3/fmi3_import_type.h
include/FMI3/fmi3_import_unit.h
include/FMI3/fmi3_import_variable.h
include/FMI3/fmi3_import_variable_list.h
include/FMI3/fmi3_import_dimension.h
include/FMI3/fmi3_import_dimension_list.h
include/FMI3/fmi3_import_convenience.h

include/FMI/fmi_import_context.h
include/FMI/fmi_import_options.h
include/FMI/fmi_import_util.h
include/FMI1/fmi1_import.h
include/FMI1/fmi1_import_capi.h
include/FMI1/fmi1_import_capabilities.h
include/FMI1/fmi1_import_cosim.h
include/FMI1/fmi1_import_type.h
include/FMI1/fmi1_import_unit.h
include/FMI1/fmi1_import_variable.h
include/FMI1/fmi1_import_variable_list.h
include/FMI1/fmi1_import_vendor_annotations.h
include/FMI1/fmi1_import_convenience.h

include/FMI2/fmi2_import.h
include/FMI2/fmi2_import_capi.h
include/FMI2/fmi2_import_type.h
include/FMI2/fmi2_import_unit.h
include/FMI2/fmi2_import_variable.h
include/FMI2/fmi2_import_variable_list.h
include/FMI2/fmi2_import_convenience.h

include/FMI3/fmi3_import.h
include/FMI3/fmi3_import_capi.h
include/FMI3/fmi3_import_type.h
include/FMI3/fmi3_import_unit.h
include/FMI3/fmi3_import_variable.h
include/FMI3/fmi3_import_variable_list.h
include/FMI3/fmi3_import_dimension.h
include/FMI3/fmi3_import_dimension_list.h
include/FMI3/fmi3_import_convenience.h

include/FMI/fmi_import_context.h
include/FMI/fmi_import_options.h
include/FMI/fmi_import_util.h
)

set(FMIIMPORT_PRIVHEADERS
src/FMI1/fmi1_import_impl.h
src/FMI1/fmi1_import_variable_list_impl.h
src/FMI1/fmi1_import_impl.h
src/FMI1/fmi1_import_variable_list_impl.h

src/FMI2/fmi2_import_impl.h
src/FMI2/fmi2_import_variable_list_impl.h
src/FMI2/fmi2_import_impl.h
src/FMI2/fmi2_import_variable_list_impl.h

src/FMI3/fmi3_import_impl.h
src/FMI3/fmi3_import_priv.h
src/FMI3/fmi3_import_variable_list_impl.h
src/FMI3/fmi3_import_dimension_list_impl.h
src/FMI3/fmi3_import_impl.h
src/FMI3/fmi3_import_priv.h
src/FMI3/fmi3_import_variable_list_impl.h
src/FMI3/fmi3_import_dimension_list_impl.h
)

PREFIXLIST(FMIIMPORT_PRIVHEADERS ${FMIIMPORTDIR}/)
PREFIXLIST(FMIIMPORT_PUBHEADERS ${FMIIMPORTDIR}/)

set(FMIIMPORTHEADERS
${FMIIMPORT_PUBHEADERS} ${FMIIMPORT_PRIVHEADERS}
${FMIIMPORT_PUBHEADERS} ${FMIIMPORT_PRIVHEADERS}
)

set(FMIIMPORTSOURCE
src/FMI/fmi_import_context.c
src/FMI/fmi_import_options.c
src/FMI/fmi_import_util.c

src/FMI1/fmi1_import_cosim.c
src/FMI1/fmi1_import_capi.c
src/FMI1/fmi1_import_type.c
src/FMI1/fmi1_import_unit.c
src/FMI1/fmi1_import_variable.c
src/FMI1/fmi1_import_variable_list.c
src/FMI1/fmi1_import_vendor_annotations.c
src/FMI1/fmi1_import.c
src/FMI1/fmi1_import_capabilities.c
src/FMI1/fmi1_import_convenience.c

src/FMI2/fmi2_import_capi.c
src/FMI2/fmi2_import_type.c
src/FMI2/fmi2_import_unit.c
src/FMI2/fmi2_import_variable.c
src/FMI2/fmi2_import_variable_list.c
src/FMI2/fmi2_import.c
src/FMI2/fmi2_import_convenience.c

src/FMI3/fmi3_import_capi.c
src/FMI3/fmi3_import_type.c
src/FMI3/fmi3_import_unit.c
src/FMI3/fmi3_import_variable.c
src/FMI3/fmi3_import_variable_list.c
src/FMI3/fmi3_import_dimension.c
src/FMI3/fmi3_import_dimension_list.c
src/FMI3/fmi3_import.c
src/FMI3/fmi3_import_priv.c
src/FMI3/fmi3_import_convenience.c
)
src/FMI/fmi_import_context.c
src/FMI/fmi_import_options.c
src/FMI/fmi_import_util.c

src/FMI1/fmi1_import_cosim.c
src/FMI1/fmi1_import_capi.c
src/FMI1/fmi1_import_type.c
src/FMI1/fmi1_import_unit.c
src/FMI1/fmi1_import_variable.c
src/FMI1/fmi1_import_variable_list.c
src/FMI1/fmi1_import_vendor_annotations.c
src/FMI1/fmi1_import.c
src/FMI1/fmi1_import_capabilities.c
src/FMI1/fmi1_import_convenience.c

src/FMI2/fmi2_import_capi.c
src/FMI2/fmi2_import_type.c
src/FMI2/fmi2_import_unit.c
src/FMI2/fmi2_import_variable.c
src/FMI2/fmi2_import_variable_list.c
src/FMI2/fmi2_import.c
src/FMI2/fmi2_import_convenience.c

src/FMI3/fmi3_import_capi.c
src/FMI3/fmi3_import_type.c
src/FMI3/fmi3_import_unit.c
src/FMI3/fmi3_import_variable.c
src/FMI3/fmi3_import_variable_list.c
src/FMI3/fmi3_import_dimension.c
src/FMI3/fmi3_import_dimension_list.c
src/FMI3/fmi3_import.c
src/FMI3/fmi3_import_priv.c
src/FMI3/fmi3_import_convenience.c
)

PREFIXLIST(FMIIMPORTSOURCE ${FMIIMPORTDIR}/)

Expand All @@ -130,8 +130,8 @@ add_dependencies(fmiimport generate_functions_import)
#add_library(fmiimport_shared SHARED ${FMIIMPORTSOURCE} ${FMIIMPORTHEADERS} )
#target_link_libraries(fmiimport_shared fmiimport ${JMUTIL_LIBRARIES} ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES})
#install(TARGETS fmiimport_shared
# ARCHIVE DESTINATION lib
# LIBRARY DESTINATION lib
# RUNTIME DESTINATION lib
# ARCHIVE DESTINATION lib
# LIBRARY DESTINATION lib
# RUNTIME DESTINATION lib
#)
endif(NOT FMIIMPORTDIR)
Loading

0 comments on commit fc8d2eb

Please sign in to comment.