WSL/SLF GitLab Repository

Commit 04e37786 authored by Mathias Bavay's avatar Mathias Bavay
Browse files

Another commit so that Visual C++ could compile without any tweaks...

parent 3c31ac6a
......@@ -42,8 +42,8 @@ IF(MSVC)
set(OPTIM "/O2 /Vmb")
set(ARCH_OPTIM "/arch:SSE2")
set(ARCH_SAFE "")
set(DEBUG "/Z7 /Od -D__DEBUG")
LIST(APPEND CFLAGS " -D_CRT_SECURE_NO_WARNINGS ")
set(DEBUG "/Z7 /Od /D__DEBUG")
LIST(APPEND CFLAGS " /D_CRT_SECURE_NO_WARNINGS /D_USE_MATH_DEFINES") #Za: strict ansi
IF(DEBUG_ARITHM)
LIST(APPEND CFLAGS " /EHa ")
ENDIF(DEBUG_ARITHM)
......@@ -57,7 +57,7 @@ IF(UNIX)
ENDIF(APPLE)
ELSE(UNIX)
IF(WIN32)
set(PLATFORM "-U__STRICT_ANSI__ -D_USE_MATH_DEFINES")
#set(PLATFORM "-U__STRICT_ANSI__ -D_USE_MATH_DEFINES")
ENDIF(WIN32)
ENDIF(UNIX)
......
......@@ -89,7 +89,8 @@ ELSE(DEST)
TARGET_LINK_LIBRARIES(${SHAREDNAME} ${LIBPROJ})
ADD_LIBRARY(${STATICNAME} STATIC ${meteoio_sources})
TARGET_LINK_LIBRARIES(${STATICNAME} ${LIBPROJ})
SET_TARGET_PROPERTIES(${SHAREDNAME} PROPERTIES
SET_TARGET_PROPERTIES(${SHAREDNAME} PROPERTIES
PREFIX "${LIBPREFIX}"
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib
ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib
CLEAN_DIRECT_OUTPUT 1
......@@ -105,7 +106,8 @@ ELSE(DEST)
)
endif(DEST MATCHES "par")
SET_TARGET_PROPERTIES(${STATICNAME} PROPERTIES
SET_TARGET_PROPERTIES(${STATICNAME} PROPERTIES
PREFIX "${LIBPREFIX}"
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib
ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib
CLEAN_DIRECT_OUTPUT 1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment