Skip to content

Commit 4b3c322

Browse files
committed
Try to fix static build 2
1 parent 9588d19 commit 4b3c322

File tree

7 files changed

+11
-7
lines changed

7 files changed

+11
-7
lines changed

dynadjust/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ endforeach()
6363

6464
if (BUILD_STATIC)
6565
message(STATUS "Static building enabled (BUILD_STATIC=ON)")
66-
66+
67+
# Build internal libraries as static instead of shared
68+
set(DNA_LIBRARY_TYPE STATIC)
69+
6770
# Include static build optimizations
6871
include(${CMAKE_CURRENT_LIST_DIR}/cmake/StaticBuildOptimizations.cmake)
6972

@@ -121,6 +124,7 @@ if (BUILD_STATIC)
121124
endif()
122125
else()
123126
message(STATUS "Static building disabled (BUILD_STATIC=OFF)")
127+
set(DNA_LIBRARY_TYPE SHARED)
124128
endif()
125129

126130
if(UNIX)

dynadjust/dynadjust/dnaadjust/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ add_definitions(-DBUILD_DNAADJUST_DLL -DBUILD_EXPORTDNATYPES -DMULTI_THREAD_ADJU
55

66
include_directories (${PROJECT_SOURCE_DIR})
77

8-
add_library (${PROJECT_NAME} SHARED
8+
add_library (${PROJECT_NAME} ${DNA_LIBRARY_TYPE}
99
${CMAKE_SOURCE_DIR}/include/io/dnaioadj.cpp
1010
${CMAKE_SOURCE_DIR}/include/io/dnaioaml.cpp
1111
${CMAKE_SOURCE_DIR}/include/io/dnaioasl.cpp

dynadjust/dynadjust/dnageoid/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ add_definitions(-DBUILD_DNAGEOID_DLL -DBUILD_EXPORTDNATYPES)
55

66
include_directories (${PROJECT_SOURCE_DIR})
77

8-
add_library (${PROJECT_NAME} SHARED
8+
add_library (${PROJECT_NAME} ${DNA_LIBRARY_TYPE}
99
${CMAKE_SOURCE_DIR}/include/io/dnaiobase.cpp
1010
${CMAKE_SOURCE_DIR}/include/io/dnaiobst.cpp
1111
${CMAKE_SOURCE_DIR}/include/measurement_types/dnastation.cpp

dynadjust/dynadjust/dnaimport/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ add_definitions(-DBUILD_DNAIMPORT_DLL -DBUILD_EXPORTDNATYPES -DMKL_ILP64)
55

66
include_directories (${PROJECT_SOURCE_DIR})
77

8-
add_library (${PROJECT_NAME} SHARED
8+
add_library (${PROJECT_NAME} ${DNA_LIBRARY_TYPE}
99
${CMAKE_SOURCE_DIR}/include/io/dnaioaml.cpp
1010
${CMAKE_SOURCE_DIR}/include/io/dnaioasl.cpp
1111
${CMAKE_SOURCE_DIR}/include/io/dnaiobase.cpp

dynadjust/dynadjust/dnaplot/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ add_definitions(-DBUILD_DNAPLOT_DLL -DBUILD_EXPORTDNATYPES -DMKL_ILP64)
55

66
include_directories (${PROJECT_SOURCE_DIR})
77

8-
add_library (${PROJECT_NAME} SHARED
8+
add_library (${PROJECT_NAME} ${DNA_LIBRARY_TYPE}
99
${CMAKE_SOURCE_DIR}/include/io/dnaiobms.cpp
1010
${CMAKE_SOURCE_DIR}/include/io/dnaiobst.cpp
1111
${CMAKE_SOURCE_DIR}/include/io/dnaiomap.cpp

dynadjust/dynadjust/dnareftran/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ add_definitions(-DBUILD_DNAREFTRAN_DLL -DBUILD_EXPORTDNATYPES -DMKL_ILP64)
55

66
include_directories (${PROJECT_SOURCE_DIR})
77

8-
add_library (${PROJECT_NAME} SHARED
8+
add_library (${PROJECT_NAME} ${DNA_LIBRARY_TYPE}
99
${CMAKE_SOURCE_DIR}/include/io/dnaiobase.cpp
1010
${CMAKE_SOURCE_DIR}/include/io/dnaiobms.cpp
1111
${CMAKE_SOURCE_DIR}/include/io/dnaiobst.cpp

dynadjust/dynadjust/dnasegment/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ add_definitions(-DBUILD_DNASEGMENT_DLL -DBUILD_EXPORTDNATYPES)
55

66
include_directories (${PROJECT_SOURCE_DIR})
77

8-
add_library (${PROJECT_NAME} SHARED
8+
add_library (${PROJECT_NAME} ${DNA_LIBRARY_TYPE}
99
${CMAKE_SOURCE_DIR}/include/io/dnaioaml.cpp
1010
${CMAKE_SOURCE_DIR}/include/io/dnaioasl.cpp
1111
${CMAKE_SOURCE_DIR}/include/io/dnaiobase.cpp

0 commit comments

Comments
 (0)