Skip to content

Commit 7eecf6f

Browse files
committed
If lib builds, an executable doesn't build
1 parent ef88fe8 commit 7eecf6f

1 file changed

Lines changed: 24 additions & 23 deletions

File tree

src/Main/CMakeLists.txt

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -44,32 +44,32 @@ SET(MAIN_SRCS
4444
# Build the Seg3D executable
4545
###########################################
4646

47-
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SEG3D_BINARY_DIR})
48-
ADD_DEFINITIONS(-DAPPLICATION_NAME=${APPLICATION_NAME})
49-
50-
IF(APPLE)
51-
LIST(APPEND MAIN_SRCS ${APPLICATION_OSX_ICON_FULL_PATH})
52-
SET_SOURCE_FILES_PROPERTIES(${APPLICATION_OSX_ICON_FULL_PATH}
53-
PROPERTIES
54-
MACOSX_PACKAGE_LOCATION Resources)
55-
ADD_EXECUTABLE(${APPLICATION_NAME} MACOSX_BUNDLE ${MAIN_SRCS})
56-
SET_TARGET_PROPERTIES(${APPLICATION_NAME}
57-
PROPERTIES
58-
MACOSX_BUNDLE_INFO_PLIST ${SEG3D_SOURCE_DIR}/Resources/info.plist
59-
MACOSX_BUNDLE_ICON_FILE ${APPLICATION_OSX_ICON}
60-
)
61-
ELSE()
62-
IF(WIN32)
63-
LIST(APPEND MAIN_SRCS ${APPLICATION_WINDOWS_RC})
64-
IF(SEG3D_SHOW_CONSOLE)
65-
ADD_EXECUTABLE(${APPLICATION_NAME} ${MAIN_SRCS})
47+
IF(NOT BUILD_STANDALONE_LIBRARY)
48+
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SEG3D_BINARY_DIR})
49+
ADD_DEFINITIONS(-DAPPLICATION_NAME=${APPLICATION_NAME})
50+
IF(APPLE)
51+
LIST(APPEND MAIN_SRCS ${APPLICATION_OSX_ICON_FULL_PATH})
52+
SET_SOURCE_FILES_PROPERTIES(${APPLICATION_OSX_ICON_FULL_PATH}
53+
PROPERTIES
54+
MACOSX_PACKAGE_LOCATION Resources)
55+
ADD_EXECUTABLE(${APPLICATION_NAME} MACOSX_BUNDLE ${MAIN_SRCS})
56+
SET_TARGET_PROPERTIES(${APPLICATION_NAME}
57+
PROPERTIES
58+
MACOSX_BUNDLE_INFO_PLIST ${SEG3D_SOURCE_DIR}/Resources/info.plist
59+
MACOSX_BUNDLE_ICON_FILE ${APPLICATION_OSX_ICON}
60+
)
61+
ELSE()
62+
IF(WIN32)
63+
LIST(APPEND MAIN_SRCS ${APPLICATION_WINDOWS_RC})
64+
IF(SEG3D_SHOW_CONSOLE)
65+
ADD_EXECUTABLE(${APPLICATION_NAME} ${MAIN_SRCS})
66+
ELSE()
67+
ADD_EXECUTABLE(${APPLICATION_NAME} WIN32 ${MAIN_SRCS})
68+
ENDIF()
6669
ELSE()
67-
ADD_EXECUTABLE(${APPLICATION_NAME} WIN32 ${MAIN_SRCS})
70+
ADD_EXECUTABLE(${APPLICATION_NAME} ${MAIN_SRCS})
6871
ENDIF()
69-
ELSE()
70-
ADD_EXECUTABLE(${APPLICATION_NAME} ${MAIN_SRCS})
7172
ENDIF()
72-
ENDIF()
7373

7474
TARGET_LINK_LIBRARIES(${APPLICATION_NAME}
7575
${SCI_BOOST_LIBRARY}
@@ -271,6 +271,7 @@ ELSE()
271271
# ENDIF()
272272
ENDIF()
273273
ENDIF()
274+
ENDIF()
274275

275276
IF(BUILD_STANDALONE_LIBRARY)
276277
ADD_SUBDIRECTORY(Seg3DLib)

0 commit comments

Comments
 (0)