summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2021-10-03 00:07:12 +0200
committerAki <please@ignore.pl>2021-10-03 00:07:12 +0200
commitd2f333bf998691760b8970c2784756d0fa81e820 (patch)
tree5eee42a18a9688b03b483aff5c2bedffb4fe8a6c
parent2af3e7b70b39b18c87883ccb24eb077a96338151 (diff)
downloadstarshatter-d2f333bf998691760b8970c2784756d0fa81e820.zip
starshatter-d2f333bf998691760b8970c2784756d0fa81e820.tar.gz
starshatter-d2f333bf998691760b8970c2784756d0fa81e820.tar.bz2
Cleaned up Opcode cmake target
-rw-r--r--Opcode/CMakeLists.txt4
-rw-r--r--Stars45/CMakeLists.txt7
2 files changed, 3 insertions, 8 deletions
diff --git a/Opcode/CMakeLists.txt b/Opcode/CMakeLists.txt
index 6666061..6010c50 100644
--- a/Opcode/CMakeLists.txt
+++ b/Opcode/CMakeLists.txt
@@ -42,11 +42,11 @@ add_library(
)
target_include_directories(
Opcode
- PRIVATE .
+ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
)
target_precompile_headers(
Opcode
- PRIVATE StdAfx.h
+ PUBLIC StdAfx.h
)
target_compile_definitions(
Opcode
diff --git a/Stars45/CMakeLists.txt b/Stars45/CMakeLists.txt
index 0232606..65d7671 100644
--- a/Stars45/CMakeLists.txt
+++ b/Stars45/CMakeLists.txt
@@ -279,11 +279,6 @@ add_executable(
target_include_directories(
Stars45
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
- PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Opcode # FIXME: Opcode is badly injured.
- )
-target_precompile_headers(
- Stars45
- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Opcode/StdAfx.h
)
target_link_libraries(
Stars45
@@ -294,7 +289,7 @@ target_link_libraries(
PUBLIC Vorbis::vorbisfile
PUBLIC Ogg::ogg
PUBLIC Png::png
- PUBLIC Opcode # FIXME: Add opcode to a namespace.
+ PUBLIC Opcode
)
target_compile_definitions(
Stars45