Skip to content

Commit 91ec861

Browse files
rogerfraserrogerfraser
committed
Apply Dale's changes to target installation
1 parent acd679e commit 91ec861

File tree

14 files changed

+3
-117
lines changed

14 files changed

+3
-117
lines changed

‎dynadjust/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.15)
22
project(dynadjust VERSION 1.2.9)
33

4-
option(BUILD_TESTING "Enable testing" ON)
4+
option(BUILD_TESTING "Enable testing" OFF)
55
option(BUILD_STATIC "Build static binaries in the 'static' directory" OFF)
66
option(USE_MKL "Use Intel MKL (Linux and Windows)" OFF)
77
option(ILP64 "Use ILP64 Interface for BLAS and LAPACK" OFF)
@@ -1589,4 +1589,5 @@ if (BUILD_TESTING)
15891589
endif ()
15901590

15911591
message ("")
1592-
message ("")
1592+
message ("")
1593+

‎dynadjust/dynadjust/dnaadjust/CMakeLists.txt‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# <dnaadjust/...> build rules
22
project (dnaadjust)
33

4-
#add_definitions(-DBUILD_DNAADJUST_DLL -DBUILD_EXPORTDNATYPES -DMKL_ILP64 -fopenmp)
54
add_definitions(-DBUILD_DNAADJUST_DLL -DBUILD_EXPORTDNATYPES)
65

76
include_directories (${PROJECT_SOURCE_DIR})
@@ -38,11 +37,3 @@ add_library (${PROJECT_NAME} SHARED
3837
target_precompile_headers (${PROJECT_NAME} PUBLIC precompile.h)
3938

4039
target_link_libraries (${PROJECT_NAME} ${DNA_LIBRARIES})
41-
42-
install (TARGETS ${PROJECT_NAME} DESTINATION lib)
43-
44-
# Install to the x64 directory
45-
set_target_properties (${PROJECT_NAME} PROPERTIES
46-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/x64")
47-
48-
install (TARGETS ${PROJECT_NAME} DESTINATION x64)

‎dynadjust/dynadjust/dnaadjustwrapper/CMakeLists.txt‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ target_link_libraries (${PROJECT_NAME} dnaadjust ${DNA_LIBRARIES})
2020

2121
set_target_properties (${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${DNA_PROGRAM_PREFIX}adjust")
2222

23-
install (TARGETS ${PROJECT_NAME} DESTINATION bin)
24-
25-
# Install to the x64 directory
26-
set_target_properties (${PROJECT_NAME} PROPERTIES
27-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/x64")
28-
29-
install (TARGETS ${PROJECT_NAME} DESTINATION x64)
3023

3124
if(BUILD_STATIC)
3225

@@ -102,7 +95,5 @@ if(BUILD_STATIC)
10295
set_target_properties(${STATIC_TARGET_NAME} PROPERTIES
10396
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/static")
10497

105-
# Install to the static directory
106-
install(TARGETS ${STATIC_TARGET_NAME} DESTINATION static)
10798

10899
endif()

‎dynadjust/dynadjust/dnageoid/CMakeLists.txt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,3 @@ target_precompile_headers (${PROJECT_NAME} PUBLIC precompile.h)
1919

2020
target_link_libraries (${PROJECT_NAME} ${DNA_LIBRARIES})
2121

22-
install (TARGETS ${PROJECT_NAME} DESTINATION lib)
23-
24-
# Install to the x64 directory
25-
set_target_properties (${PROJECT_NAME} PROPERTIES
26-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/x64")
27-
28-
install (TARGETS ${PROJECT_NAME} DESTINATION x64)

‎dynadjust/dynadjust/dnageoidwrapper/CMakeLists.txt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@ target_link_libraries (${PROJECT_NAME} dnageoid ${DNA_LIBRARIES})
1919

2020
set_target_properties (${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${DNA_PROGRAM_PREFIX}geoid")
2121

22-
install (TARGETS ${PROJECT_NAME} DESTINATION bin)
2322

24-
# Install to the x64 directory
25-
set_target_properties (${PROJECT_NAME} PROPERTIES
26-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/x64")
27-
28-
install (TARGETS ${PROJECT_NAME} DESTINATION x64)
2923

3024
if(BUILD_STATIC)
3125

@@ -100,6 +94,4 @@ if(BUILD_STATIC)
10094
set_target_properties(${STATIC_TARGET_NAME} PROPERTIES
10195
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/static")
10296

103-
# Install to the static directory
104-
install(TARGETS ${STATIC_TARGET_NAME} DESTINATION static)
10597
endif()

‎dynadjust/dynadjust/dnaimport/CMakeLists.txt‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
11
# <dnaimport/...> build rules
22
project (dnaimport)
33

4-
#add_definitions(-DBUILD_DNAIMPORT_DLL -DBUILD_EXPORTDNATYPES -DMKL_ILP64 -fopenmp)
54
add_definitions(-DBUILD_DNAIMPORT_DLL -DBUILD_EXPORTDNATYPES)
65

7-
8-
## BLAS/LAPACK or MKL
9-
#if(APPLE)
10-
# # Force disable MKL ILP64 and -fopenmp on mac
11-
# remove_definitions(-DMKL_ILP64)
12-
# # Remove any -fopenmp flags that may have been added
13-
# string(REPLACE "-fopenmp" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
14-
# remove_definitions(-fopenmp)
15-
# message(STATUS "Removed -fopenmp flag (macOS) for project ${PROJECT_NAME}")
16-
#endif()
17-
186
include_directories (${PROJECT_SOURCE_DIR})
197

208
add_library (${PROJECT_NAME} SHARED
@@ -55,11 +43,3 @@ add_library (${PROJECT_NAME} SHARED
5543
target_precompile_headers (${PROJECT_NAME} PUBLIC precompile.h)
5644

5745
target_link_libraries (${PROJECT_NAME} ${DNA_LIBRARIES})
58-
59-
install (TARGETS ${PROJECT_NAME} DESTINATION lib)
60-
61-
# Install to the x64 directory
62-
set_target_properties (${PROJECT_NAME} PROPERTIES
63-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/x64")
64-
65-
install (TARGETS ${PROJECT_NAME} DESTINATION x64)

‎dynadjust/dynadjust/dnaimportwrapper/CMakeLists.txt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,7 @@ target_link_libraries (${PROJECT_NAME} dnaimport ${DNA_LIBRARIES})
2020
set_target_properties (${PROJECT_NAME} PROPERTIES
2121
OUTPUT_NAME "${DNA_PROGRAM_PREFIX}import")
2222

23-
install (TARGETS ${PROJECT_NAME} DESTINATION bin)
2423

25-
# Install to the x64 directory
26-
set_target_properties (${PROJECT_NAME} PROPERTIES
27-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/x64")
28-
29-
install (TARGETS ${PROJECT_NAME} DESTINATION x64)
3024

3125
if(BUILD_STATIC)
3226

@@ -101,6 +95,4 @@ if(BUILD_STATIC)
10195
set_target_properties(${STATIC_TARGET_NAME} PROPERTIES
10296
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/static")
10397

104-
# Install to the static directory
105-
install(TARGETS ${STATIC_TARGET_NAME} DESTINATION static)
10698
endif()

‎dynadjust/dynadjust/dnaplot/CMakeLists.txt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,3 @@ target_precompile_headers (${PROJECT_NAME} PUBLIC precompile.h)
2929

3030
target_link_libraries (${PROJECT_NAME} ${DNA_LIBRARIES})
3131

32-
install (TARGETS ${PROJECT_NAME} DESTINATION lib)
33-
34-
# Install to the x64 directory
35-
set_target_properties (${PROJECT_NAME} PROPERTIES
36-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/x64")
37-
38-
install (TARGETS ${PROJECT_NAME} DESTINATION x64)

‎dynadjust/dynadjust/dnaplotwrapper/CMakeLists.txt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,7 @@ target_link_libraries (${PROJECT_NAME} dnaplot ${DNA_LIBRARIES})
1818

1919
set_target_properties (${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${DNA_PROGRAM_PREFIX}plot")
2020

21-
install (TARGETS ${PROJECT_NAME} DESTINATION bin)
2221

23-
# Install to the x64 directory
24-
set_target_properties (${PROJECT_NAME} PROPERTIES
25-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/x64")
26-
27-
install (TARGETS ${PROJECT_NAME} DESTINATION x64)
2822

2923
if(BUILD_STATIC)
3024

@@ -100,6 +94,4 @@ if(BUILD_STATIC)
10094
set_target_properties(${STATIC_TARGET_NAME} PROPERTIES
10195
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/static")
10296

103-
# Install to the static directory
104-
install(TARGETS ${STATIC_TARGET_NAME} DESTINATION static)
10597
endif()

‎dynadjust/dynadjust/dnareftran/CMakeLists.txt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# <dnareftran/...> build rules
22
project (dnareftran)
33

4-
#add_definitions(-DBUILD_DNAREFTRAN_DLL -DBUILD_EXPORTDNATYPES -DMKL_ILP64 -fopenmp)
54
add_definitions(-DBUILD_DNAREFTRAN_DLL -DBUILD_EXPORTDNATYPES)
65

76
include_directories (${PROJECT_SOURCE_DIR})
@@ -36,10 +35,3 @@ target_precompile_headers (${PROJECT_NAME} PUBLIC precompile.h)
3635

3736
target_link_libraries (${PROJECT_NAME} ${DNA_LIBRARIES})
3837

39-
install (TARGETS ${PROJECT_NAME} DESTINATION lib)
40-
41-
# Install to the x64 directory
42-
set_target_properties (${PROJECT_NAME} PROPERTIES
43-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/x64")
44-
45-
install (TARGETS ${PROJECT_NAME} DESTINATION x64)

0 commit comments

Comments
 (0)