Skip to content

Commit 07ddc39

Browse files
Disable shared libs in FLANG on windows for proper testing
1 parent d88c10d commit 07ddc39

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

.github/workflows/build-msys2.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build on Windows
1+
name: Build on Windows with MSYS2
22

33
on:
44
push:
@@ -82,7 +82,7 @@ jobs:
8282
-D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
8383
-D CMAKE_INSTALL_PREFIX=${{github.workspace}}/lapack_install
8484
-D SLICOT_TESTING:BOOL=ON
85-
-D SLICOT_BUILD_SHARED_LIBS:BOOL=ON
85+
-D SLICOT_BUILD_SHARED_LIBS:BOOL=OFF
8686
-D CMAKE_EXE_LINKER_FLAGS="-Wl,--stack=2097152"
8787
8888

CMakeLists.txt

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
1717
INCLUDE(OutOfSource)
1818

1919
# Compile Options
20-
OPTION(SLICOT_BUILD_SHARED_LIBS "Build shared libraries" ON)
2120
OPTION(SLICOT_DEBUG "Enable Debug Symbol generation" OFF)
2221
OPTION(SLICOT_INTEGER8 "Build with 64-bit integers (ILP64)" OFF) # Add ILP64 option
2322

@@ -35,15 +34,6 @@ ENDIF()
3534

3635

3736
# Shared libraries
38-
IF (BUILD_SHARED_LIBS)
39-
SET(SLICOT_BUILD_SHARED_LIBS ON)
40-
endif()
41-
IF(SLICOT_BUILD_SHARED_LIBS)
42-
SET(BUILD_SHARED_LIBS ON)
43-
ELSE()
44-
SET(BUILD_SHARED_LIBS OFF)
45-
ENDIF()
46-
4737
IF (SLICOT_INTEGER8)
4838
SET(INTEGER8 ON)
4939
ELSE()
@@ -56,9 +46,11 @@ SET(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
5646
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
5747

5848
# Output directories
59-
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
60-
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
61-
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
49+
IF(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
50+
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
51+
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
52+
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
53+
ENDIF()
6254

6355
# Configure the Build
6456

@@ -135,7 +127,7 @@ endif()
135127

136128
ADD_SUBDIRECTORY(src)
137129

138-
IF(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
130+
IF(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR AND SLICOT_TESTING)
139131
ADD_SUBDIRECTORY(examples)
140132
ENDIF()
141133

0 commit comments

Comments
 (0)