Commit 85c211d6 authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'shared-fix'

e5733515 Fix recent regression in installation of namelink
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !97
parents aa0f06ec e5733515
...@@ -196,6 +196,11 @@ IF(KWSYS_STANDALONE) ...@@ -196,6 +196,11 @@ IF(KWSYS_STANDALONE)
ENDIF() ENDIF()
ENDIF() ENDIF()
# Choose default shared/static build if not specified.
IF(NOT DEFINED KWSYS_BUILD_SHARED)
SET(KWSYS_BUILD_SHARED ${BUILD_SHARED_LIBS})
ENDIF()
# Include helper macros. # Include helper macros.
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/kwsysPlatformTests.cmake) INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/kwsysPlatformTests.cmake)
INCLUDE(CheckTypeSize) INCLUDE(CheckTypeSize)
...@@ -439,11 +444,6 @@ ELSE() ...@@ -439,11 +444,6 @@ ELSE()
SET(KWSYS_NAME_IS_KWSYS 0) SET(KWSYS_NAME_IS_KWSYS 0)
ENDIF() ENDIF()
# Choose default shared/static build if not specified.
IF(KWSYS_BUILD_SHARED MATCHES "^KWSYS_BUILD_SHARED$")
SET(KWSYS_BUILD_SHARED ${BUILD_SHARED_LIBS})
ENDIF()
IF(KWSYS_BUILD_SHARED) IF(KWSYS_BUILD_SHARED)
SET(KWSYS_BUILD_SHARED 1) SET(KWSYS_BUILD_SHARED 1)
SET(KWSYS_LIBRARY_TYPE SHARED) SET(KWSYS_LIBRARY_TYPE SHARED)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment