From 7b831ed394df31c83b2b66dce2e62fbec90b46c3 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Sat, 8 Aug 2020 13:46:08 +0200 Subject: [PATCH] w32pragma only used in Wrap/ --- {Core/Tools => Wrap}/w32pragma.h | 0 cmake/modules/SetUpWindows.cmake | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename {Core/Tools => Wrap}/w32pragma.h (100%) diff --git a/Core/Tools/w32pragma.h b/Wrap/w32pragma.h similarity index 100% rename from Core/Tools/w32pragma.h rename to Wrap/w32pragma.h diff --git a/cmake/modules/SetUpWindows.cmake b/cmake/modules/SetUpWindows.cmake index 5cdec04e1f4..bb763c225f3 100644 --- a/cmake/modules/SetUpWindows.cmake +++ b/cmake/modules/SetUpWindows.cmake @@ -9,5 +9,5 @@ endif() add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY=1) message(STATUS "Disabling static align for Eigen") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /D_USE_MATH_DEFINES /wd4005 -I${CMAKE_SOURCE_DIR}/Core/Tools -I${CMAKE_SOURCE_DIR}/Wrap -FIw32pragma.h") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /D_USE_MATH_DEFINES /wd4005 -I${CMAKE_SOURCE_DIR}/Wrap -FIw32pragma.h") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:libcmtd.lib") -- GitLab