Merge branch 'master' of jugit.fz-juelich.de:mlz/kww

.gitlab-ci.yml

@@ -126,26 +126,21 @@ centos7_gcc:
   stage: build
   script: *scr
 
-#windows:
-#
-#  NOTE: disabled because 'long double' is too short
-#
-#  tags:
-#  - Windows
-#  stage: build
-#  script:
-#    - New-Item -ItemType "directory" -Confirm:$false -Force:$true -Name "build"
-#    - cd build
-#    - cmd.exe "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-#    - cmake -G "Visual Studio 15 2017" -A x64 -T host=x64 -DLIB_MAN=OFF -DCMAKE_INSTALL_PREFIX=C:\opt\x64 -B. ..
-#    - cmake --build . --config Release
-#    - Get-Location
-#    - dir
-#    - dir Release
-#    - ctest -C Release --output-on-failure
-#    - cmake --install .
-#  artifacts:
-#    paths:
-#    - lib/*.h
-#    - build/Release/*.dll
-#    expire_in: 1 week
\ No newline at end of file
+windows:
+  tags:
+  - Windows
+  stage: build
+  script:
+    - New-Item -ItemType "directory" -Confirm:$false -Force:$true -Name "build"
+    - cd build
+    - cmake -G "Ninja" -DLIB_MAN=OFF -DCMAKE_INSTALL_PREFIX=C:\opt\x64 -B. ..
+    - cmake --build . # --config Release
+    - Get-Location
+    - dir
+    - ctest --output-on-failure # -C Release
+    - cmake --install .
+  artifacts:
+    paths:
+    - lib/*.h
+    - build/*.dll
+    expire_in: 1 week
\ No newline at end of file

CMakeLists.txt

@@ -5,40 +5,40 @@ include(PreventInSourceBuilds)
 
 project(kww VERSION 3.7 LANGUAGES C)
 
+## Options.
+
 if(NOT DEFINED BUILD_SHARED_LIBS)
     option(BUILD_SHARED_LIBS "Build as shared library" ON)
 endif()
 if(NOT DEFINED LIB_MAN)
     option(LIB_MAN "Build library man pages" ON)
 endif()
+option(PEDANTIC "Compile with pedantic warnings" ON)
+option(WERROR "Treat warnings as errors" OFF)
+
+## Compiler settings.
 
 set(CMAKE_C_STANDARD 99)
 if(MSVC)
-    set(CTEST_CONFIGURATION_TYPE "${JOB_BUILD_CONFIGURATION}")
-    if(BUILD_SHARED_LIBS)
-        set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-    endif()
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-else()
-    option(PEDANTIC "Compile with pedantic warnings" ON)
-    option(WERROR "Treat warnings as errors" OFF)
-    add_compile_options(-O2)
-    if(PEDANTIC)
-        add_compile_options(-pedantic -Wall)
-    endif()
-    if(WERROR)
-        add_compile_options(-Werror)
-    endif()
+    message(FATAL_ERROR "kww must not be compiled with MSVC because it needs 80 bits long doubles")
+endif()
+add_compile_options(-O2)
+if(PEDANTIC)
+    add_compile_options(-pedantic -Wall)
+endif()
+if(WERROR)
+    add_compile_options(-Werror)
 endif()
 
-include(CTest)
+## Install settings.
 
 set(destination ${CMAKE_INSTALL_PREFIX})
 configure_file("kww.pc.in" "kww.pc" @ONLY)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kww.pc"
     DESTINATION "${destination}/lib/pkgconfig/")
 
+include(CTest)
+
 add_subdirectory(lib)
 add_subdirectory(demo)
 add_subdirectory(test)