Installs headers to INCLUDE/served

CMakeLists.txt

@@ -95,10 +95,3 @@ IF (SERVED_BUILD_TESTS)
     ENABLE_TESTING (true)
 ENDIF (SERVED_BUILD_TESTS)
 ADD_SUBDIRECTORY (src)
-
-#
-# Add Install Targets
-#
-IF (EXISTS "${MAINFOLDER}/src/${PROJECT_NAME}" AND IS_DIRECTORY "${MAINFOLDER}/src/${PROJECT_NAME}")
-    INSTALL (DIRECTORY "${MAINFOLDER}/src/${PROJECT_NAME}" DESTINATION "${PROJECT_NAME}")
-ENDIF (EXISTS "${MAINFOLDER}/src/${PROJECT_NAME}" AND IS_DIRECTORY "${MAINFOLDER}/src/${PROJECT_NAME}")

src/served/CMakeLists.txt

@@ -22,14 +22,14 @@
 # Process ragel files
 #
 IF (RAGEL_FOUND)
-  FILE (GLOB_RECURSE served_RL ${CMAKE_CURRENT_SOURCE_DIR}/*.rl)
+	FILE (GLOB_RECURSE served_RL ${CMAKE_CURRENT_SOURCE_DIR}/*.rl)
 
-  FOREACH (R_FILE ${served_RL})
-    GET_FILENAME_COMPONENT (R_NAME ${R_FILE} NAME_WE)
-    STRING (REPLACE ".rl" ".cpp" R_OUTFILE "${R_FILE}")
-    RAGEL_TARGET (${R_NAME} ${R_FILE} ${R_OUTFILE})
-    LIST (APPEND served_RLSOURCES ${RAGEL_${R_NAME}_OUTPUTS})
-  ENDFOREACH (R_FILE ${served_RL})
+	FOREACH (R_FILE ${served_RL})
+		GET_FILENAME_COMPONENT (R_NAME ${R_FILE} NAME_WE)
+		STRING (REPLACE ".rl" ".cpp" R_OUTFILE "${R_FILE}")
+		RAGEL_TARGET (${R_NAME} ${R_FILE} ${R_OUTFILE})
+		LIST (APPEND served_RLSOURCES ${RAGEL_${R_NAME}_OUTPUTS})
+	ENDFOREACH (R_FILE ${served_RL})
 ENDIF (RAGEL_FOUND)
 
 # 
@@ -51,15 +51,15 @@ SET (served_LIBS ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 SET (served_BIN ${PROJECT_NAME})
 
 IF (NOT DEFINED SERVED_BUILD_SHARED)
-   IF (CMAKE_CROSSCOMPILING)
-       SET(SERVED_BUILD_SHARED 0)
-   ELSE (CMAKE_CROSSCOMPILING)
-       SET(SERVED_BUILD_SHARED 1)
-   ENDIF (CMAKE_CROSSCOMPILING)
+	IF (CMAKE_CROSSCOMPILING)
+		SET(SERVED_BUILD_SHARED 0)
+	ELSE (CMAKE_CROSSCOMPILING)
+		SET(SERVED_BUILD_SHARED 1)
+	ENDIF (CMAKE_CROSSCOMPILING)
 ENDIF (NOT DEFINED SERVED_BUILD_SHARED)
 
 IF (NOT DEFINED SERVED_BUILD_STATIC)
-   SET(SERVED_BUILD_STATIC 1)
+	SET(SERVED_BUILD_STATIC 1)
 ENDIF (NOT DEFINED SERVED_BUILD_STATIC)
 
 #
@@ -91,22 +91,23 @@ SET (test_LIBS ${Boost_LIBRARIES} ${PROJECT_NAME})
 # Test build rules
 #
 IF (SERVED_BUILD_TESTS)
-  IF (NOT CMAKE_CROSSCOMPILING)
-      LINK_DIRECTORIES (${MAINFOLDER}/lib)
-      FOREACH (T_FILE ${test_SRCS})
-          GET_FILENAME_COMPONENT (T_NAME ${T_FILE} NAME_WE)
-          SET (T_NAME "${T_NAME}_test")
-          ADD_EXECUTABLE (${T_NAME} ${T_FILE} ${test_HDRS})
-          TARGET_LINK_LIBRARIES (${T_NAME} ${test_LIBS})
-          ADD_TEST (${T_NAME} ${MAINFOLDER}/bin/${T_NAME})
-      ENDFOREACH (T_FILE ${test_SRCS})
-  ENDIF (NOT CMAKE_CROSSCOMPILING)
+	IF (NOT CMAKE_CROSSCOMPILING)
+		LINK_DIRECTORIES (${MAINFOLDER}/lib)
+		FOREACH (T_FILE ${test_SRCS})
+			GET_FILENAME_COMPONENT (T_NAME ${T_FILE} NAME_WE)
+			SET (T_NAME "${T_NAME}_test")
+			ADD_EXECUTABLE (${T_NAME} ${T_FILE} ${test_HDRS})
+			TARGET_LINK_LIBRARIES (${T_NAME} ${test_LIBS})
+			ADD_TEST (${T_NAME} ${MAINFOLDER}/bin/${T_NAME})
+		ENDFOREACH (T_FILE ${test_SRCS})
+	ENDIF (NOT CMAKE_CROSSCOMPILING)
 ENDIF (SERVED_BUILD_TESTS)
 
 #
 # Install target
 #
 FOREACH (H_FILE ${served_HDRS})
-    STRING (REGEX MATCH "(.*)[/\\]" DIR ${H_FILE})
-    INSTALL (FILES ${H_FILE} DESTINATION include)
+	SET (H_INSTALL_DIR "served")
+	STRING (REGEX MATCH "(.*)[/\\]" DIR ${H_FILE})
+	INSTALL (FILES ${H_FILE} DESTINATION include/${H_INSTALL_DIR}/${DIR})
 ENDFOREACH (H_FILE ${served_HDRS})