|
 |
94fbceb |
From 3b7b2ba770daba0ca360aeeff08d422470720cb6 Mon Sep 17 00:00:00 2001
|
|
|
94fbceb |
From: Yuri <yuri@tsoft.com>
|
|
|
94fbceb |
Date: Sun, 14 Jan 2018 11:00:38 -0800
|
|
|
94fbceb |
Subject: [PATCH 07/10] Replaced dl with ${CMAKE_DL_LIBS} in CMakeLists.txt
|
|
|
94fbceb |
files for compatibility with systems which don't need -ldl.
|
|
|
94fbceb |
|
|
|
94fbceb |
---
|
|
|
94fbceb |
k3dsdk/CMakeLists.txt | 2 +-
|
|
|
94fbceb |
tests/sdk/CMakeLists.txt | 2 +-
|
|
|
94fbceb |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
94fbceb |
|
|
|
94fbceb |
diff --git a/k3dsdk/CMakeLists.txt b/k3dsdk/CMakeLists.txt
|
|
|
94fbceb |
index a5af9fe2..f9c452b8 100644
|
|
|
94fbceb |
--- a/k3dsdk/CMakeLists.txt
|
|
|
94fbceb |
+++ b/k3dsdk/CMakeLists.txt
|
|
|
94fbceb |
@@ -57,7 +57,7 @@ TARGET_LINK_LIBRARIES(k3dsdk
|
|
|
94fbceb |
${Boost_PROGRAM_OPTIONS_LIBRARY}
|
|
|
94fbceb |
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
|
|
|
94fbceb |
${Boost_SYSTEM_LIBRARY}
|
|
|
94fbceb |
- "dl" # for gold linker
|
|
|
94fbceb |
+ ${CMAKE_DL_LIBS} # for gold linker
|
|
|
94fbceb |
)
|
|
|
94fbceb |
|
|
|
94fbceb |
IF(K3D_ENABLE_NLS)
|
|
|
94fbceb |
diff --git a/tests/sdk/CMakeLists.txt b/tests/sdk/CMakeLists.txt
|
|
|
94fbceb |
index 2a670057..56483430 100644
|
|
|
94fbceb |
--- a/tests/sdk/CMakeLists.txt
|
|
|
94fbceb |
+++ b/tests/sdk/CMakeLists.txt
|
|
|
94fbceb |
@@ -76,7 +76,7 @@ IF(UNIX)
|
|
|
94fbceb |
GET_TARGET_PROPERTY(SHARED_DYNAMIC_CAST_LIBRARY shared-dynamic-cast LOCATION)
|
|
|
94fbceb |
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/shared_dynamic_cast_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/shared_dynamic_cast_config.h)
|
|
|
94fbceb |
ADD_EXECUTABLE(test-shared-dynamic-cast shared_dynamic_cast.cpp)
|
|
|
94fbceb |
- target_link_libraries(test-shared-dynamic-cast dl)
|
|
|
94fbceb |
+ target_link_libraries(test-shared-dynamic-cast ${CMAKE_DL_LIBS})
|
|
|
94fbceb |
IF(NOT APPLE)
|
|
|
94fbceb |
SET_TARGET_PROPERTIES(test-shared-dynamic-cast PROPERTIES LINK_FLAGS -Wl,-E)
|
|
|
94fbceb |
ENDIF()
|
|
|
94fbceb |
--
|
|
|
94fbceb |
2.14.3
|
|
|
94fbceb |
|