Permalink
Browse files

Fix build of offset editor skeleton, make it optional and disabled by…

… default.
  • Loading branch information...
1 parent 94872b8 commit 891c4542561113751d2997e63de7abab84e731aa @peterix peterix committed Aug 14, 2010
Showing with 8 additions and 2 deletions.
  1. +6 −1 CMakeLists.txt
  2. +1 −0 offsetedit/CMakeLists.txt
  3. +1 −1 offsetedit/src/CMakeLists.txt
View
@@ -25,6 +25,7 @@ OPTION(BUILD_DFHACK_DOCUMENTATION "Create doxygen documentation for developers"
OPTION(BUILD_DFHACK_EXAMPLES "Build example tools" OFF)
OPTION(BUILD_DFHACK_PLAYGROUND "Build tools from the playground folder" OFF)
OPTION(BUILD_DFHACK_C_BINDIGS "Build the C portion of the library" ON)
+OPTION(BUILD_OFFSET_EDITOR "Build the Offset GUI editor (not ready for use)." OFF)
include_directories (${CMAKE_SOURCE_DIR}/library/include/)
include_directories (${CMAKE_SOURCE_DIR}/library/shm/)
@@ -33,7 +34,11 @@ include_directories (${CMAKE_SOURCE_DIR}/library/depends/tinyxml/)
include_directories (${CMAKE_SOURCE_DIR}/library/depends/argstream/)
add_subdirectory (library)
-add_subdirectory (offsetedit)
+
+IF(BUILD_OFFSET_EDITOR)
+ add_subdirectory (offsetedit)
+ENDIF(BUILD_OFFSET_EDITOR)
+
add_subdirectory (library/shm)
add_subdirectory (tools/examples)
add_subdirectory (tools/playground)
@@ -1,3 +1,4 @@
+
project(dfoffsetedit)
cmake_minimum_required(VERSION 2.6)
find_package(Qt4 QUIET)
@@ -18,7 +18,7 @@ SET( dfoffsetedit_RCS
# in result dfoffsetedit_RC_SRCS variable will contain paths to files produced by rcc
QT4_ADD_RESOURCES( dfoffsetedit_RC_SRCS ${dfoffsetedit_RCS} )
-QT4_WRAP_UI(dfoffsetedit_UI_h ${dfedit_UI})
+QT4_WRAP_UI(dfoffsetedit_UI_h ${dfoffsetedit_UI})
qt4_automoc(${dfoffsetedit_SRCS})
add_executable(dfoffsetedit ${dfoffsetedit_SRCS} ${dfoffsetedit_RC_SRCS} ${dfoffsetedit_UI_h})

0 comments on commit 891c454

Please sign in to comment.