Skip to content

Commit 26e7383

Browse files
committed
Another update for CMake build.
so_5/CMakeLists.txt now can define SOBJECTIZER_INSTALL by itself.
1 parent a3b5d92 commit 26e7383

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

dev/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cmake_minimum_required(VERSION 3.8)
22

3-
set(MASTER_PROJECT OFF)
3+
set(SOBJECTIZER_MASTER_PROJECT OFF)
44
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
5-
set(MASTER_PROJECT ON)
5+
set(SOBJECTIZER_MASTER_PROJECT ON)
66
endif()
77

88
option(BUILD_ALL "Enable building examples and tests [default: OFF]" OFF)
@@ -11,7 +11,8 @@ option(BUILD_TESTS "Enable building tests [default: OFF]" OFF)
1111

1212
option(SOBJECTIZER_BUILD_STATIC "Build static SObjectizer library [default: ON]" ON)
1313
option(SOBJECTIZER_BUILD_SHARED "Build shared SObjectizer library [default: ON]" ON)
14-
option(SOBJECTIZER_INSTALL "Generate install target for SObjectizer" ${MASTER_PROJECT})
14+
option(SOBJECTIZER_INSTALL "Generate install target for SObjectizer"
15+
${SOBJECTIZER_MASTER_PROJECT})
1516

1617
if((NOT SOBJECTIZER_BUILD_STATIC) AND (NOT SOBJECTIZER_BUILD_SHARED))
1718
message(FATAL_ERROR "at least one of SOBJECTIZER_BUILD_STATIC/SOBJECTIZER_BUILD_SHARED must be defined")

dev/so_5/CMakeLists.txt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
cmake_minimum_required(VERSION 3.8)
22

3+
if(NOT SOBJECTIZER_MASTER_PROJECT)
4+
set(SOBJECTIZER_MASTER_PROJECT OFF)
5+
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
6+
set(SOBJECTIZER_MASTER_PROJECT ON)
7+
endif()
8+
endif()
9+
310
if((NOT SOBJECTIZER_BUILD_STATIC) AND (NOT SOBJECTIZER_BUILD_SHARED))
4-
set(SOBJECTIZER_BUILD_STATIC ON)
5-
set(SOBJECTIZER_BUILD_SHARED ON)
11+
set(SOBJECTIZER_BUILD_STATIC ON)
12+
set(SOBJECTIZER_BUILD_SHARED ON)
13+
endif()
14+
15+
if(NOT SOBJECTIZER_INSTALL)
16+
set(SOBJECTIZER_INSTALL ${SOBJECTIZER_MASTER_PROJECT})
617
endif()
718

819
include(cmake/target.cmake)

0 commit comments

Comments
 (0)