Ensure that protobuf compiler runs before soruce is built. Fixes #114

MisterTea · May 26, 2018 · f046894 · f046894
1 parent b8124da
commit f046894
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 41 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,6 +62,26 @@ PROTOBUF_GENERATE_CPP(
 
   proto/ET.proto
   )
+PROTOBUF_GENERATE_CPP(
+  ETERMINAL_SRCS
+  ETERMINAL_HDRS
+
+  proto/ETerminal.proto
+  )
+PROTOBUF_GENERATE_CPP(
+  HTM_SRCS
+  HTM_HDRS
+
+  proto/HTM.proto
+  )
+add_custom_target(
+  generated-code
+  DEPENDS
+
+  ${ET_SRCS} ${ET_HDRS}
+  ${ETERMINAL_SRCS} ${ETERMINAL_HDRS}
+  ${HTM_SRCS} ${HTM_HDRS}
+  )
 
 IF(FREEBSD)
   set(CORE_LIBRARIES util)
@@ -75,14 +95,17 @@ include_directories(
   terminal
   ${PROTOBUF_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
   ${CURSES_INCLUDE_DIR}
   ${sodium_INCLUDE_DIR}
   ${GFLAGS_INCLUDE_DIRS}
   ${SELINUX_INCLUDE_DIR}
   ${UTEMPTER_INCLUDE_DIR}
   )
 
-set(${PROJECT_NAME}_SRC
+add_library(
+  et-lib
+  STATIC
 
   src/BackedReader.cpp
   src/BackedWriter.cpp
@@ -97,27 +120,11 @@ set(${PROJECT_NAME}_SRC
   src/UnixSocketHandler.cpp
   src/easylogging++.cc
 
-  ${ET_SRCS} ${ET_HDRS}
-  )
-
-# Build the static library.
-add_library(${PROJECT_NAME}-static STATIC ${${PROJECT_NAME}_SRC})
-# Build the shared library.
-#add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SRC})
-
-target_link_libraries(
-  ${PROJECT_NAME}-static
+  ${ET_SRCS}
   )
-
-# Make sure the compiler can find include files for our Hello library
-# when other libraries or executables link to Hello
-target_include_directories (${PROJECT_NAME}-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-PROTOBUF_GENERATE_CPP(
-  ETERMINAL_SRCS
-  ETERMINAL_HDRS
-
-  proto/ETerminal.proto
+add_dependencies(
+  et-lib
+  generated-code
   )
 
 add_library(
@@ -134,7 +141,11 @@ add_library(
 
   ${ETERMINAL_SRCS} ${ETERMINAL_HDRS}
   )
-add_dependencies(TerminalCommon EternalTCP-static)
+add_dependencies(
+  TerminalCommon
+  et-lib
+  generated-code
+  )
 
 add_executable (
   etserver
@@ -147,7 +158,7 @@ target_link_libraries (
   etserver
   LINK_PUBLIC
   TerminalCommon
-  EternalTCP-static
+  et-lib
   ${CMAKE_THREAD_LIBS_INIT}
   ${PROTOBUF_LIBRARIES}
   ${GFLAGS_LIBRARIES}
@@ -167,7 +178,7 @@ target_link_libraries (
     et
     LINK_PUBLIC
     TerminalCommon
-    EternalTCP-static
+    et-lib
     ${CMAKE_THREAD_LIBS_INIT}
     ${PROTOBUF_LIBRARIES}
     ${GFLAGS_LIBRARIES}
@@ -176,13 +187,6 @@ target_link_libraries (
     ${CORE_LIBRARIES}
 )
 
-PROTOBUF_GENERATE_CPP(
-  HTM_SRCS
-  HTM_HDRS
-
-  proto/HTM.proto
-  )
-
 add_library (
   HtmCommon
   STATIC
@@ -209,7 +213,7 @@ target_link_libraries (
 
   HtmCommon
   TerminalCommon
-  EternalTCP-static
+  et-lib
   ${CMAKE_THREAD_LIBS_INIT}
   ${PROTOBUF_LIBRARIES}
   ${GLOG_LIBRARIES}
@@ -232,7 +236,7 @@ target_link_libraries (
 
   HtmCommon
   TerminalCommon
-  EternalTCP-static
+  et-lib
   ${CMAKE_THREAD_LIBS_INIT}
   ${PROTOBUF_LIBRARIES}
   ${GLOG_LIBRARIES}

diff --git a/sandbox/CMakeLists.txt b/sandbox/CMakeLists.txt
@@ -19,7 +19,7 @@ foreach(SRC_LINE ${SANDBOX_SRC})
     ${FILE_LINE}
     LINK_PUBLIC
     TerminalCommon
-    ${PROJECT_NAME}-static
+    et-lib
     ${CMAKE_THREAD_LIBS_INIT}
     ${PROTOBUF_LIBRARIES}
     ${GFLAGS_LIBRARIES}

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -2,24 +2,24 @@ set(GTEST_PATH ${PROJECT_SOURCE_DIR}/test)
 
 file(GLOB TEST_SRCS Test*.cpp )
 add_executable(
-  ${PROJECT_NAME}-test
+  et-test
 
   ${TEST_SRCS}
   )
 
 add_dependencies(
-  ${PROJECT_NAME}-test
+  et-test
   TerminalCommon
-  ${PROJECT_NAME}-static
+  et-lib
   gtest
   gtest_main
   gmock
   gmock_main)
 
 target_link_libraries(
-  ${PROJECT_NAME}-test
+  et-test
   TerminalCommon
-  ${PROJECT_NAME}-static
+  et-lib
   ${CMAKE_THREAD_LIBS_INIT}
   gtest
   gtest_main
@@ -31,6 +31,6 @@ target_link_libraries(
   util
   )
 add_test(
-  ${PROJECT_NAME}-test
-  ${PROJECT_NAME}-test
+  et-test
+  et-test
   )