Changeset 53be5c8 in nscp for libs/lua/CMakeLists.txt

Timestamp:

07/12/12 07:43:42 (10 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.1, 0.4.2

Children:

c327ce5

Parents:

6090c98

Message:

• LUAScript: Improved lua scripting module a lot
• LUAScript: Added protocol buffer support to lua scripts
• tests: Rewrote (halfway there) test_nrpe python script as a lua script.
• CheckEventLog: Fixed command name when submitting real-time "no action checks"

File:

• libs/lua/CMakeLists.txt (modified) (3 diffs)

libs/lua/CMakeLists.txt

@@ -2 +2 @@
 
 IF (HAVE_LUA)
-  message(STATUS "Found CACHED lua in ${LUA_SOURCE_DIR}")
-ELSE (HAVE_LUA)
-  FIND_PATH(LUA_SOURCE_DIR lua.h ${LUA_INCLUE_DIR}/src)
-  
-  IF (LUA_INCLUE_DIR)
-    message(STATUS "Found lua in ${LUA_INCLUE_DIR}")
-    SET(HAVE_LUA TRUE PARENT_SCOPE)
-    SET(HAVE_LUA TRUE)
-    SET(LUA_SOURCE_DIR ${LUA_INCLUE_DIR})
-  ELSE (LUA_INCLUE_DIR)
-    message(STATUS "Lua was not found in ${LUA_SOURCE_DIR} (LUA_SOURCE_DIR)")
-  ENDIF (LUA_INCLUE_DIR)
-ENDIF (HAVE_LUA)
-
-
-IF (HAVE_LUA)
+  SET(LUA_SOURCE_DIR ${LUA_INCLUE_DIR})
   #FILE (GLOB lua_SOURCES "${LUA_SOURCE_DIR}/*.c")
   
@@ -51 +36 @@
     ${LUA_SOURCE_DIR}/lzio.c
   )
-
   
   FILE (GLOB lua_HEADERS "${LUA_SOURCE_DIR}/*.h")
-  message(STATUS "Using lua from ${LUA_SOURCE_DIR}")
   IF (MSVC)
     CMAKE_POLICY(SET CMP0008 NEW)
@@ -70 +53 @@
   SET_TARGET_PROPERTIES(lua_static PROPERTIES FOLDER "libraries")
 
-# IF (WIN32)
-#   TARGET_LINK_LIBRARIES (cryptopp Ws2_32.lib)
-#   TARGET_LINK_LIBRARIES (cryptopp_static Ws2_32.lib)
-# ENDIF (WIN32)
-
   IF(APPLE)
      SET_TARGET_PROPERTIES(lua PROPERTIES COMPILE_FLAGS "-fPIC -w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")