Msvc static lib changes rebased (shibatch#330)

Co-authored-by: shibatch <[email protected]>
blapie · Aug 31, 2020 · 3a078bb · 3a078bb
1 parent c666f3b
commit 3a078bb
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,13 +22,17 @@ option(ENABLE_ALTSQRT "Enable alternative sqrt method (aarch64 only)" OFF)
 
 option(DISABLE_FFTW "Disable testing the DFT library with FFTW" OFF)
 
-# See doc/build-with-cmake.md for instructions on how to build Sleef.
 cmake_minimum_required(VERSION 3.4.3)
+
 # Set to NEW when updating cmake_minimum_required to VERSION >= 3.7.2
 if(${CMAKE_VERSION} VERSION_GREATER "3.7.1")
   cmake_policy(SET CMP0066 OLD)
 endif()
 
+if(${CMAKE_VERSION} VERSION_GREATER "3.14.99")
+  cmake_policy(SET CMP0091 NEW)
+endif()
+
 enable_testing()
 
 set(SLEEF_VERSION_MAJOR 3)

diff --git a/Configure.cmake b/Configure.cmake
@@ -842,6 +842,7 @@ endif()
 
 if (NOT BUILD_SHARED_LIBS)
   set(COMMON_TARGET_DEFINITIONS SLEEF_STATIC_LIBS=1)
+  set(SLEEF_STATIC_LIBS 1)
 endif()
 
 if (COMPILER_SUPPORTS_WEAK_ALIASES)

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -161,6 +161,22 @@ pipeline {
 			 '''
             	     }
                 }
+
+                stage('clang-6.0') {
+            	     agent { label 'clang-6' }
+            	     steps {
+	    	     	 sh '''
+                	 echo "clang-6.0 on" `hostname`
+		         export CC=clang-6.0
+			 rm -rf build
+ 			 mkdir build
+			 cd build
+			 cmake -GNinja -DBUILD_QUAD=TRUE -DBUILD_INLINE_HEADERS=TRUE ..
+			 ninja
+		         ctest -j `nproc`
+			 '''
+            	     }
+                }
             }
         }
     }

diff --git a/sleef-config.h.in b/sleef-config.h.in
@@ -1,16 +1,11 @@
 // Configuration of @PROJECT_NAME@ /////////////////////////////////////////////
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef SLEEF_CONFIG_H
+#define SLEEF_CONFIG_H
 
 #define SLEEF_VERSION_MAJOR @SLEEF_VERSION_MAJOR@
 #define SLEEF_VERSION_MINOR @SLEEF_VERSION_MINOR@
 
-// FEATURE DETECTION ***********************************************************
+#cmakedefine SLEEF_STATIC_LIBS
 
-#cmakedefine COMPILER_SUPPORTS_LONG_DOUBLE
-#cmakedefine COMPILER_SUPPORTS_FLOAT128
-
-#cmakedefine COMPILER_SUPPORTS_SSE2
-
-#endif // CONFIG_H
+#endif // SLEEF_CONFIG_H