Merge remote-tracking branch 'blunted2night/cmake_no_esmtool_fix'

12 years ago · 78e55a92a8
parent 215b43cc7b dcfa902525
commit 78e55a92a8
1 changed files with 3 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -534,7 +534,9 @@ if (WIN32)
 		set_target_properties(omwlauncher PROPERTIES COMPILE_FLAGS ${WARNINGS})
 	endif (BUILD_LAUNCHER)
    set_target_properties(openmw PROPERTIES COMPILE_FLAGS ${WARNINGS})
-	set_target_properties(esmtool PROPERTIES COMPILE_FLAGS ${WARNINGS})
+    if (BUILD_ESMTOOL)
+        set_target_properties(esmtool PROPERTIES COMPILE_FLAGS ${WARNINGS})
+    endif (BUILD_ESMTOOL)
  endif(MSVC)

  # Same for MinGW