[simspark-svn] SF.net SVN: simspark:[409] trunk/spark

[<he...@us...>]

Revision: 409
          http://sourceforge.net/p/simspark/svn/409
Author:   hedayat
Date:     2016-06-02 11:31:53 +0000 (Thu, 02 Jun 2016)
Log Message:
-----------
Add lib dependency for guiplugin/guilayout which fixes parallel build issue

Modified Paths:
--------------
    trunk/spark/guilayout/CMakeLists.txt
    trunk/spark/guiplugin/CMakeLists.txt

Modified: trunk/spark/guilayout/CMakeLists.txt
===================================================================
--- trunk/spark/guilayout/CMakeLists.txt	2016-05-31 20:58:29 UTC (rev 408)
+++ trunk/spark/guilayout/CMakeLists.txt	2016-06-02 11:31:53 UTC (rev 409)
@@ -1,9 +1,7 @@
 include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
     ${OPENGL_INCLUDE_DIR})
 
-if (WIN32 OR APPLE)
-   set(spark_gui_libs salt oxygen zeitgeist kerosin spark carbon rcssnet3D)
-endif (WIN32 OR APPLE)
+set(spark_gui_libs salt oxygen zeitgeist kerosin spark carbon rcssnet3D)
 
 add_subdirectory(guigridlayout)
 add_subdirectory(guisimplelayout)

Modified: trunk/spark/guiplugin/CMakeLists.txt
===================================================================
--- trunk/spark/guiplugin/CMakeLists.txt	2016-05-31 20:58:29 UTC (rev 408)
+++ trunk/spark/guiplugin/CMakeLists.txt	2016-06-02 11:31:53 UTC (rev 409)
@@ -1,11 +1,9 @@
 include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
     ${OPENGL_INCLUDE_DIR})
 
-if (WIN32 OR APPLE)
-   set(spark_gui_libs 
-      salt oxygen zeitgeist kerosin spark carbon rcssnet3D
-   )
-endif (WIN32 OR APPLE)
+set(spark_gui_libs
+   salt oxygen zeitgeist kerosin spark carbon rcssnet3D
+)
 
 add_subdirectory(logframe)
 add_subdirectory(setupframe)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.