The expiration time for new job artifacts in CI/CD pipelines is now 30 days (GitLab default). Previously generated artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 7900370b authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Merge remote-tracking branch 'remotes/origin/nmake-support' into development

parents 8a8f9bba 5fbabbf9
......@@ -35,6 +35,16 @@ ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 Win64")
MESSAGE("Visual Studio 11 Build (64 Bit) (not actively supported)")
ELSEIF(${CMAKE_GENERATOR} MATCHES "NMake")
SET(CAMPVIS_NMAKE TRUE)
# NMake-based builds may very well use a Visual Studio compiler
IF(MSVC90)
SET(CAMPVIS_MSVC2008 TRUE)
ELSEIF(MSVC10)
SET(CAMPVIS_MSVC2010 TRUE)
ELSEIF(MSVC11)
SET(CAMPVIS_MSVC11 TRUE)
ENDIF(MSVC90)
IF(CMAKE_CL_64)
SET(CAMPVIS_WIN64 TRUE)
MESSAGE(STATUS "NMake 64 Bit Build")
......@@ -110,7 +120,16 @@ IF(WIN32)
ENDIF()
LIST(APPEND CampvisGlobalExternalLibs netapi32 version)
# Append the name of the current build type to the path of the CMake output directory so that
# NMake places all build artifacts in the same directories as Visual Studio. This makes NMake
# builds compatible with our macro that copies external DLLs into the build directory.
IF(CAMPVIS_NMAKE)
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}")
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}")
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}")
ENDIF(CAMPVIS_NMAKE)
ELSEIF(UNIX)
LIST(APPEND CampvisGlobalDefinitions "-DUNIX")
LIST(APPEND CampvisGlobalDefinitions "-Wall -Wno-unused-local-typedefs -Wno-unused-variable")
......
Markdown is supported
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