From 421e5fd82cde1f076f3de7326b0303dd6585a4ae Mon Sep 17 00:00:00 2001 From: Timothy Collett Date: Mon, 2 Jul 2012 11:02:48 -0400 Subject: [PATCH] Swap order of includes to work around silly compiler/assembler bug on OS X --- library/CMakeLists.txt | 2 +- plugins/Plugins.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 73f6c9ec7..75485ff22 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -8,8 +8,8 @@ IF(UNIX) OPTION(CONSOLE_NO_CATCH "Make the console not catch 'CTRL+C' events for easier debugging." OFF) ENDIF() -include_directories (include) include_directories (proto) +include_directories (include) SET(PERL_EXECUTABLE "perl" CACHE FILEPATH "This is the perl executable to run in the codegen step. Tweak it if you need to run a specific one.") diff --git a/plugins/Plugins.cmake b/plugins/Plugins.cmake index a8252e706..0ea37ace9 100644 --- a/plugins/Plugins.cmake +++ b/plugins/Plugins.cmake @@ -7,8 +7,8 @@ ENDIF() include_directories("${dfhack_SOURCE_DIR}/library/include") include_directories("${dfhack_SOURCE_DIR}/library/proto") -include_directories("${dfhack_SOURCE_DIR}/library/depends/xgetopt") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/proto") +include_directories("${dfhack_SOURCE_DIR}/library/depends/xgetopt") MACRO(CAR var) SET(${var} ${ARGV1})