From 839f9e01aa0f8d8616872859c8533a0691eca881 Mon Sep 17 00:00:00 2001 From: clemens Date: Sat, 7 Dec 2019 21:40:16 +0100 Subject: [PATCH 1/2] CMake fixes --- CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd09360..7aec80c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -303,8 +303,11 @@ install(FILES #Add an alias so that library can be used inside the build tree, e.g. when testing -add_library(${PROJECT_NAME}::${PROJECT_LIB_SHARED} ALIAS ${PROJECT_LIB_SHARED}) -add_library(${PROJECT_NAME}::${PROJECT_LIB_STATIC} ALIAS ${PROJECT_LIB_STATIC}) +if(MODEST_BUILD_SHARED) + add_library(${PROJECT_NAME}::${PROJECT_LIB_SHARED} ALIAS ${PROJECT_LIB_SHARED}) +elseif(MODEST_BUILD_STATIC) + add_library(${PROJECT_NAME}::${PROJECT_LIB_STATIC} ALIAS ${PROJECT_LIB_STATIC}) +endif() ################ From fef14ba87eadfcd3daa92906b3c816339b01b13d Mon Sep 17 00:00:00 2001 From: clemens Date: Sat, 7 Dec 2019 22:09:32 +0100 Subject: [PATCH 2/2] check for static and shared separately instead of using elseif --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7aec80c..2e4289f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -305,7 +305,8 @@ install(FILES #Add an alias so that library can be used inside the build tree, e.g. when testing if(MODEST_BUILD_SHARED) add_library(${PROJECT_NAME}::${PROJECT_LIB_SHARED} ALIAS ${PROJECT_LIB_SHARED}) -elseif(MODEST_BUILD_STATIC) +endif() +if(MODEST_BUILD_STATIC) add_library(${PROJECT_NAME}::${PROJECT_LIB_STATIC} ALIAS ${PROJECT_LIB_STATIC}) endif()