From bf8674a05eba20ecf07063206a8fa86b227f06a9 Mon Sep 17 00:00:00 2001
From: "Novak M Mr (UG - Computer Science)" <mn00272@surrey.ac.uk>
Date: Tue, 15 Jan 2019 21:13:43 +0000
Subject: [PATCH] Fixing CXX flags and install command for encoder
---
CMakeLists.txt | 7 -------
src/rew/encoder/CMakeLists.txt | 2 +-
tests/CMakeLists.txt | 3 +++
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30f5467..4ff789b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,13 +12,6 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs)
find_package(Threads)
-if(MINGW)
- if (CMAKE_SIZEOF_VOID_P EQUAL 8)
- set("${CMAKE_C_FLAGS} -Wa,-mbig-obj" CMAKE_C_FLAGS)
- set("${CMAKE_CXX_FLAGS} -Wa,-mbig-obj" CMAKE_CXX_FLAGS)
- endif()
-endif()
-
# Our subdirectories
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/rew/decoder)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/rew/encoder)
diff --git a/src/rew/encoder/CMakeLists.txt b/src/rew/encoder/CMakeLists.txt
index 0094776..2026a13 100644
--- a/src/rew/encoder/CMakeLists.txt
+++ b/src/rew/encoder/CMakeLists.txt
@@ -27,7 +27,7 @@ set(ENCODER_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include/encoder PARENT_SCOPE)
# Add install step
if(BUILD_INSTALL)
- install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/encoder DESTINATION include/encoder)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/rew/encoder DESTINATION include/rew/encoder)
if(MSVC)
install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}> DESTINATION bin OPTIONAL)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 24edf6c..6be4efd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -16,6 +16,9 @@ foreach(FILENAME ${TESTS})
if(MSVC)
set_target_properties(${TEST_PROJ} PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE")
endif()
+ if(MINGW)
+ set_target_properties(${TEST_PROJ} PROPERTIES COMPILE_FLAGS "-Wa,-mbig-obj")
+ endif()
set_property(TARGET ${TEST_PROJ} PROPERTY FOLDER "rew/tests")
add_test(NAME ${TEST_PROJ} COMMAND ${TEST_PROJ})
--
GitLab