Skip to content

Commit f838b56

Browse files
BenLubarBenLubar
committed
Remove $(NOINHERIT) which was inexplicably included in a bunch of plugins.
1 parent c6f12e4 commit f838b56

6 files changed

Lines changed: 22 additions & 105 deletions

File tree

‎plugins/diggingInvaders/CMakeLists.txt‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,4 @@ SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
1515
# mash them together (headers are marked as headers and nothing will try to compile them)
1616
LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
1717

18-
#linux
19-
IF(UNIX)
20-
add_definitions(-DLINUX_BUILD)
21-
SET(PROJECT_LIBS
22-
# add any extra linux libs here
23-
${PROJECT_LIBS}
24-
)
25-
# windows
26-
ELSE(UNIX)
27-
SET(PROJECT_LIBS
28-
# add any extra linux libs here
29-
${PROJECT_LIBS}
30-
$(NOINHERIT)
31-
)
32-
ENDIF(UNIX)
33-
# this makes sure all the stuff is put in proper places and linked to dfhack
34-
35-
DFHACK_PLUGIN(diggingInvaders ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
18+
DFHACK_PLUGIN(diggingInvaders ${PROJECT_SRCS})

‎plugins/embark-assistant/CMakeLists.txt‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,4 @@ SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
2727
# mash them together (headers are marked as headers and nothing will try to compile them)
2828
LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
2929

30-
# option to use a thread for no particular reason
31-
#OPTION(SKELETON_THREAD "Use threads in the skeleton plugin." ON)
32-
#linux
33-
IF(UNIX)
34-
add_definitions(-DLINUX_BUILD)
35-
SET(PROJECT_LIBS
36-
# add any extra linux libs here
37-
${PROJECT_LIBS}
38-
)
39-
# windows
40-
ELSE(UNIX)
41-
SET(PROJECT_LIBS
42-
# add any extra windows libs here
43-
${PROJECT_LIBS}
44-
$(NOINHERIT)
45-
)
46-
ENDIF(UNIX)
47-
# this makes sure all the stuff is put in proper places and linked to dfhack
48-
DFHACK_PLUGIN(embark-assistant ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
30+
DFHACK_PLUGIN(embark-assistant ${PROJECT_SRCS})

‎plugins/labormanager/CMakeLists.txt‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,4 @@ SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
1414
# mash them together (headers are marked as headers and nothing will try to compile them)
1515
LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
1616

17-
#linux
18-
IF(UNIX)
19-
add_definitions(-DLINUX_BUILD)
20-
SET(PROJECT_LIBS
21-
# add any extra linux libs here
22-
${PROJECT_LIBS}
23-
)
24-
# windows
25-
ELSE(UNIX)
26-
SET(PROJECT_LIBS
27-
# add any extra linux libs here
28-
${PROJECT_LIBS}
29-
$(NOINHERIT)
30-
)
31-
ENDIF(UNIX)
32-
# this makes sure all the stuff is put in proper places and linked to dfhack
33-
34-
DFHACK_PLUGIN(labormanager ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
17+
DFHACK_PLUGIN(labormanager ${PROJECT_SRCS})

‎plugins/remotefortressreader/CMakeLists.txt‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,9 @@ SET_SOURCE_FILES_PROPERTIES( ${PROJECT_PROTO} PROPERTIES GENERATED TRUE)
2626
# mash them together (headers are marked as headers and nothing will try to compile them)
2727
LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS};${PROJECT_PROTO})
2828

29-
#linux
30-
IF(UNIX)
31-
add_definitions(-DLINUX_BUILD)
32-
SET(PROJECT_LIBS
33-
# add any extra linux libs here
34-
${PROJECT_LIBS}
35-
)
36-
IF(NOT APPLE)
37-
SET(PROJECT_LIBS ${PROJECT_LIBS} SDL)
38-
ENDIF()
39-
# windows
40-
ELSE(UNIX)
41-
SET(PROJECT_LIBS
42-
# add any extra windows libs here
43-
${PROJECT_LIBS}
44-
$(NOINHERIT)
45-
)
46-
ENDIF(UNIX)
29+
IF(UNIX AND NOT APPLE)
30+
SET(PROJECT_LIBS ${PROJECT_LIBS} SDL)
31+
ENDIF()
32+
4733
# this makes sure all the stuff is put in proper places and linked to dfhack
4834
DFHACK_PLUGIN(RemoteFortressReader ${PROJECT_SRCS} LINK_LIBRARIES protobuf-lite ${PROJECT_LIBS} COMPILE_FLAGS_MSVC "/FI\"Export.h\"" COMPILE_FLAGS_GCC "-include Export.h -Wno-misleading-indentation" )

‎plugins/rendermax/CMakeLists.txt‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,7 @@ SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
1515
# mash them together (headers are marked as headers and nothing will try to compile them)
1616
LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
1717

18-
19-
#linux
20-
IF(UNIX)
21-
add_definitions(-DLINUX_BUILD)
22-
SET(PROJECT_LIBS
23-
# add any extra linux libs here
24-
lua
25-
dfhack-tinythread
26-
${PROJECT_LIBS}
27-
)
28-
# windows
29-
ELSE(UNIX)
30-
SET(PROJECT_LIBS
31-
# add any extra windows libs here
32-
lua
33-
dfhack-tinythread
34-
${PROJECT_LIBS}
35-
$(NOINHERIT)
36-
)
37-
ENDIF(UNIX)
3818
# this makes sure all the stuff is put in proper places and linked to dfhack
39-
DFHACK_PLUGIN(rendermax ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
19+
DFHACK_PLUGIN(rendermax ${PROJECT_SRCS} LINK_LIBRARIES lua dfhack-tinythread)
4020
install(FILES rendermax.lua
4121
DESTINATION ${DFHACK_DATA_DESTINATION}/raw)

‎plugins/skeleton/CMakeLists.txt‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,23 @@ LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
1414

1515
# option to use a thread for no particular reason
1616
OPTION(SKELETON_THREAD "Use threads in the skeleton plugin." ON)
17-
#linux
1817
IF(UNIX)
19-
add_definitions(-DLINUX_BUILD)
18+
IF(APPLE)
19+
SET(PROJECT_LIBS
20+
# add any extra mac libraries here
21+
${PROJECT_LIBS}
22+
)
23+
ELSE()
24+
SET(PROJECT_LIBS
25+
# add any extra linux libraries here
26+
${PROJECT_LIBS}
27+
)
28+
ENDIF()
29+
ELSE()
2030
SET(PROJECT_LIBS
21-
# add any extra linux libs here
31+
# add any extra windows libraries here
2232
${PROJECT_LIBS}
2333
)
24-
# windows
25-
ELSE(UNIX)
26-
SET(PROJECT_LIBS
27-
# add any extra windows libs here
28-
${PROJECT_LIBS}
29-
$(NOINHERIT)
30-
)
31-
ENDIF(UNIX)
34+
ENDIF()
3235
# this makes sure all the stuff is put in proper places and linked to dfhack
3336
DFHACK_PLUGIN(skeleton ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})

0 commit comments

Comments
 (0)