Revert CMake changes

Dependency cycle

Author: iacore

libs/CMakeLists.txt

@@ -10,13 +10,6 @@ add_definitions("-DBUILDING_IOVMALL_DLL")
 # Output our static library to the top-level _build hierarchy
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/_build/lib)
 
-# Define the subdirectories we can reach from here that we want
-# to go into and build stuff.
-add_subdirectory(coroutine)
-add_subdirectory(basekit)
-add_subdirectory(garbagecollector)
-add_subdirectory(iovm)
-
 # Our Io source files to be "compiled" into a C source file.
 #file(GLOB IO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/iovm/io/*.io")
 set(IO_SRCS
@@ -62,8 +55,7 @@ file(GLOB COROUTINE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/coroutine/source/*.c")
 file(GLOB BASEKIT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/basekit/source/*.c")
 file(GLOB GARBAGECOLLECTOR_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/garbagecollector/source/*.c")
 file(GLOB IOVM_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/iovm/source/*.c")
-
-list(APPEND IOVM_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../deps/parson/parson.c ${CMAKE_CURRENT_SOURCE_DIR}/iovm/source/IoVMInit.c)
+list(APPEND IOVM_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../deps/parson/parson.c)
 
 # Marvelous flags, likely compiler dependent.
 #add_definitions(-DBUILDING_IOVM_DLL)# -DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
@@ -76,6 +68,14 @@ set(IOVMALL_STATIC_SRCS
 ${IOVM_SRCS}
 )
 
+# The custom command to generate source/IoVMInit.c which is our
+# "compiled" Io to C source code.
+add_custom_command(
+OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/iovm/source/IoVMInit.c
+COMMAND ${PROJECT_BINARY_DIR}/_build/binaries/io2c VMCode IoState_doString_ ${IO_SRCS} > ${CMAKE_CURRENT_SOURCE_DIR}/iovm/source/IoVMInit.c
+DEPENDS io2c
+)
+
 # Include dirs, -I flags and whatnot
 include_directories(
 ${CMAKE_CURRENT_SOURCE_DIR}/iovm/source
@@ -86,7 +86,17 @@ include_directories(
 ${CMAKE_CURRENT_SOURCE_DIR}/garbagecollector/source
 )
 
+# Add a file to our library sources.
+list(APPEND IOVMALL_STATIC_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/iovm/source/IoVMInit.c) # Because we generate it
+
 # ...And the static library. Refer to IOVMALL_STATIC_SRCS definition
 # up top.
 add_library(iovmall_static STATIC ${IOVMALL_STATIC_SRCS})
 add_dependencies(iovmall_static io2c basekit coroutine garbagecollector iovmall)
+
+# Define the subdirectories we can reach from here that we want
+# to go into and build stuff.
+add_subdirectory(coroutine)
+add_subdirectory(basekit)
+add_subdirectory(garbagecollector)
+add_subdirectory(iovm)