From 08c1a3eff56c42748db41969d77d1bb5657e415c Mon Sep 17 00:00:00 2001
From: Martin Beseda <martinbeseda@seznam.cz>
Date: Sun, 9 Sep 2018 22:50:09 +0200
Subject: [PATCH] Trying to fix CI
---
src/CMakeLists.txt | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a928ba99..e0144312 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,17 +58,14 @@ if ("${BUILD_LIB}" STREQUAL "yes")
# set(PREFIX "lib")
endif()
- if(WIN32 AND "${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
- add_library(libboost_unit_test STATIC boost_test_lib_dummy.cpp)
- add_library(libexprtk STATIC exprtk.cpp)
- elseif(WIN32 AND "${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared")
+ if(WIN32 AND "${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared")
message(FATAL_ERROR "Only static linking of external dependencies is supported for Windows systems now!")
elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
- add_library(boost_unit_test STATIC boost_test_lib_dummy.cpp)
- add_library(exprtk STATIC exprtk.cpp)
+ add_library(${PREFIX}boost_unit_test STATIC boost_test_lib_dummy.cpp)
+ add_library(${PREFIX}exprtk STATIC exprtk.cpp)
elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared")
- add_library(boost_unit_test SHARED boost_test_lib_dummy.cpp)
- add_library(exprtk SHARED exprtk.cpp)
+ add_library(${PREFIX}boost_unit_test SHARED boost_test_lib_dummy.cpp)
+ add_library(${PREFIX}exprtk SHARED exprtk.cpp)
endif()
target_include_directories(
--
GitLab