aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-07-24 08:58:07 -0700
committerGitHub <noreply@github.com>2017-07-24 08:58:07 -0700
commit378b6bd957bbdf92823c00a6dc287603842f2777 (patch)
tree377efe540c4576439589bcc995c4ce30a185a661
parentf4817ead064872417e4f5e81a94bf8ecb2c6a865 (diff)
parente47238f98c3325d69e9731ab81d43b17a8372363 (diff)
downloadvcpkg-378b6bd957bbdf92823c00a6dc287603842f2777.tar.gz
vcpkg-378b6bd957bbdf92823c00a6dc287603842f2777.zip
Merge pull request #1503 from traversaro/patch-5
[gsl] Add a "d" debug postfix
-rw-r--r--ports/gsl/CMakeLists.txt6
-rw-r--r--ports/gsl/CONTROL2
2 files changed, 6 insertions, 2 deletions
diff --git a/ports/gsl/CMakeLists.txt b/ports/gsl/CMakeLists.txt
index 45abb5bd2..eb38a4431 100644
--- a/ports/gsl/CMakeLists.txt
+++ b/ports/gsl/CMakeLists.txt
@@ -48,6 +48,10 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/gsl_types.h "${GSLTYPES_H}")
file(GLOB_RECURSE PUBLIC_HEADERS gsl*.h)
list(APPEND PUBLIC_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/gsl_types.h)
+# The debug libraries have a "d" postfix so that CMake's FindGSL.cmake
+# module can distinguish between Release and Debug libraries
+set(CMAKE_DEBUG_POSTFIX "d")
+
add_library(gslcblas ${CBLAS_SOURCES})
set_target_properties(gslcblas PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -74,4 +78,4 @@ install(TARGETS gsl gslcblas
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
${TARGET_INSTALL_OPTIONS}
-) \ No newline at end of file
+)
diff --git a/ports/gsl/CONTROL b/ports/gsl/CONTROL
index a18b341c9..62d0c7e8e 100644
--- a/ports/gsl/CONTROL
+++ b/ports/gsl/CONTROL
@@ -1,3 +1,3 @@
Source: gsl
-Version: 2.3-1
+Version: 2.3-2
Description: The GNU Scientific Library is a numerical library for C and C++ programmers