Commit 03ec2d4d authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[CHANGE] - now ALL openwalnut libs are prefixed with OW.

parent 7deaf65e
......@@ -140,7 +140,7 @@ ADD_SUBDIRECTORY( kernel )
ADD_SUBDIRECTORY( common )
ADD_SUBDIRECTORY( modules )
ADD_EXECUTABLE( walnut-bin OpenWalnut.cpp )
TARGET_LINK_LIBRARIES( walnut-bin kernel dataHandler gui guiqt4 common ge ${Boost_LIBRARIES} )
TARGET_LINK_LIBRARIES( walnut-bin OWkernel OWdataHandler OWgui OWguiqt4 OWcommon OWge ${Boost_LIBRARIES} )
#---------- Shaders -------------
option( OW_COPY_SHADERS "This enables copying shaders with every make call." ON )
......
......@@ -7,8 +7,8 @@ ADD_SUBDIRECTORY( datastructures )
ADD_SUBDIRECTORY( constraints )
ADD_SUBDIRECTORY( math )
ADD_LIBRARY( common ${COMMON_SRC} ${COMMON_DATASTRUCTURES_SRC} ${COMMON_EXCEPTIONS_SRC} ${MATH_SRC} ${FIBERSIMILARITY_SRC} )
TARGET_LINK_LIBRARIES( common ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
ADD_LIBRARY( OWcommon ${COMMON_SRC} ${COMMON_DATASTRUCTURES_SRC} ${COMMON_EXCEPTIONS_SRC} ${MATH_SRC} ${FIBERSIMILARITY_SRC} )
TARGET_LINK_LIBRARIES( OWcommon ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
# Set the prefix and suffix of dynamically loadable modules to match
# CMAKEs naming of them. The quotes are necessary so the shell doesn't mess
......@@ -24,7 +24,7 @@ ENDIF()
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${COMMON_SRC}"
"common"
"OWcommon"
"WSegmentationFault.cpp" # can't test seg-faults ;-)
"WTransferable.cpp" # its an empty class
"WPropertyBase.cpp" # its an abstract class. Its small functionality is tested in WPropertyVariable_test.h
......
......@@ -3,6 +3,6 @@ FILE( GLOB COMMON_DATASTRUCTURES_SRC "*.cpp" "*.h" )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${COMMON_DATASTRUCTURES_SRC}"
"common" # no libs for linking required
"OWcommon" # no libs for linking required
)
ENDIF( OW_COMPILE_TESTS )
......@@ -3,6 +3,6 @@ FILE( GLOB COMMON_DATASTRUCTURES_SRC "*.cpp" "*.h" )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${COMMON_DATASTRUCTURES_SRC}"
"common" # no libs for linking required
"OWcommon" # no libs for linking required
)
ENDIF( OW_COMPILE_TESTS )
......@@ -3,7 +3,7 @@ FILE( GLOB MATH_SRC "*.cpp" "*.h" )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${MATH_SRC}"
"common"
"OWcommon"
"WMath.cpp" # this declares only a namespace
)
ENDIF( OW_COMPILE_TESTS )
......@@ -15,10 +15,10 @@ FILE( GLOB DATAHANDLER_IO_SRC "io/*.cpp" "io/*.h" ) # former WLoader
# ADD_LIBRARY( dataHandler ${DATAHANDLER_SRC} ${DATAHANDLER_EXCEPTIONS_SRC} ${DATAHANDLER_IO_SRC} ${DATAHANDLER_DATASTRUCTURES_SRC} )
# TARGET_LINK_LIBRARIES( dataHandler common ${Boost_LIBRARIES} niftiio libeep ${OPENSCENEGRAPH_LIBRARIES})
#ELSE()
ADD_LIBRARY( dataHandler ${DATAHANDLER_SRC} ${DATAHANDLER_EXCEPTIONS_SRC} ${DATAHANDLER_IO_SRC} ${DATAHANDLER_DATASTRUCTURES_SRC} )
TARGET_LINK_LIBRARIES( dataHandler common ${Boost_LIBRARIES} niftiio biosig libeep ${OPENSCENEGRAPH_LIBRARIES})
ADD_LIBRARY( OWdataHandler ${DATAHANDLER_SRC} ${DATAHANDLER_EXCEPTIONS_SRC} ${DATAHANDLER_IO_SRC} ${DATAHANDLER_DATASTRUCTURES_SRC} )
TARGET_LINK_LIBRARIES( OWdataHandler OWcommon ${Boost_LIBRARIES} niftiio biosig libeep ${OPENSCENEGRAPH_LIBRARIES})
#ENDIF()
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${DATAHANDLER_SRC}" "dataHandler" "WDataTexture3D.cpp" "WDataHandlerEnums.cpp" )
CXXTEST_ADD_TESTS_FROM_LIST( "${DATAHANDLER_SRC}" "OWdataHandler" "WDataTexture3D.cpp" "WDataHandlerEnums.cpp" )
ENDIF( OW_COMPILE_TESTS )
......@@ -3,6 +3,6 @@ FILE( GLOB DATAHANDLER_DATASTRUCTURES_SRC "*.cpp" "*.h" )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${DATAHANDLER_DATASTRUCTURES_SRC}"
"dataHandler;common" # no libs for linking required
"OWdataHandler;OWcommon" # no libs for linking required
)
ENDIF( OW_COMPILE_TESTS )
......@@ -11,7 +11,7 @@ FILE( GLOB DATAHANDLER_IO_SRC "*.cpp" "*.h" )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${DATAHANDLER_IO_SRC}"
"dataHandler;niftiio;biosig;libeep"
"OWdataHandler;niftiio;biosig;libeep"
"WWriter.cpp" # too simple to test
"WReader.cpp" # too simple to test
"WWriterLookUpTableVTK.cpp" # there is only one member function which is not trivial, but its more an integration test
......
......@@ -5,12 +5,12 @@ FILE( GLOB GE_EXCEPTIONS_SRC "exceptions/*.cpp" "exceptions/*.h" )
FILE( GLOB GE_ALGORITHMS_SRC "algorithms/*.cpp" "algorithms/*.h" )
FILE( GLOB GE_SRC "*.cpp" "*.h" )
ADD_LIBRARY( ge ${GE_SRC} ${GE_EXCEPTIONS_SRC} ${GE_ALGORITHMS_SRC} )
TARGET_LINK_LIBRARIES( ge common ${OPENGL_gl_LIBRARY} ${OPENSCENEGRAPH_LIBRARIES} )
ADD_LIBRARY( OWge ${GE_SRC} ${GE_EXCEPTIONS_SRC} ${GE_ALGORITHMS_SRC} )
TARGET_LINK_LIBRARIES( OWge OWcommon ${OPENGL_gl_LIBRARY} ${OPENSCENEGRAPH_LIBRARIES} )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${GE_SRC}" "ge;kernel"
CXXTEST_ADD_TESTS_FROM_LIST( "${GE_SRC}" "OWge;OWkernel"
"WGESignals.cpp"
"WGraphicsEngine.cpp"
"WGEScene.cpp"
......
......@@ -2,13 +2,13 @@ ADD_SUBDIRECTORY( qt4 )
FILE( GLOB GUI_SRC "*.cpp" "*.h" )
ADD_LIBRARY( gui ${GUI_SRC} )
TARGET_LINK_LIBRARIES( gui common )
ADD_LIBRARY( OWgui ${GUI_SRC} )
TARGET_LINK_LIBRARIES( OWgui OWcommon )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${GUI_SRC}"
"common;utils"
"OWcommon"
"WGUI.cpp"
)
ENDIF( OW_COMPILE_TESTS )
......@@ -43,5 +43,5 @@ QT4_WRAP_CPP(GUI_QT4_MOC_SRCS ${GUI_QT4_MOC_HDRS} )
FILE(GLOB GUI_QT4_SRC "*.cpp" "guiElements/*.cpp" "datasetbrowser/*.cpp" "ribbonMenu/*.cpp" "events/*.cpp" "*.h" "guiElements/*.h" "datasetbrowser/*.h" "ribbonMenu/*.h" "events/*.h" )
ADD_LIBRARY( guiqt4 ${GUI_QT4_SRC} ${GUI_QT4_MOC_SRCS} )
TARGET_LINK_LIBRARIES( guiqt4 common gui ge kernel ${QT_LIBS} ${Boost_LIBRARIES} )
ADD_LIBRARY( OWguiqt4 ${GUI_QT4_SRC} ${GUI_QT4_MOC_SRCS} )
TARGET_LINK_LIBRARIES( OWguiqt4 OWcommon OWgui OWge OWkernel ${QT_LIBS} ${Boost_LIBRARIES} )
......@@ -5,15 +5,15 @@ FILE( GLOB_RECURSE MODULES_SRC "modules/*.cpp" "modules/*.h" )
FILE( GLOB KERNEL_EXCEPTIONS_SRC "exceptions/*.cpp" "exceptions/*.h" )
FILE( GLOB KERNEL_COMBINER_SRC "combiner/*.cpp" "combiner/*.h" )
ADD_LIBRARY( kernel ${KERNEL_SRC} ${MODULES_SRC} ${KERNEL_EXCEPTIONS_SRC} ${KERNEL_COMBINER_SRC} )
TARGET_LINK_LIBRARIES( kernel common dataHandler ge ${OPENSCENEGRAPH_LIBRARIES} ${CMAKE_DL_LIBS} )
ADD_LIBRARY( OWkernel ${KERNEL_SRC} ${MODULES_SRC} ${KERNEL_EXCEPTIONS_SRC} ${KERNEL_COMBINER_SRC} )
TARGET_LINK_LIBRARIES( OWkernel OWcommon OWdataHandler OWge ${OPENSCENEGRAPH_LIBRARIES} ${CMAKE_DL_LIBS} )
# Unit tests
IF( OW_COMPILE_TESTS )
# SET( testLibs guiqt4 )
CXXTEST_ADD_TESTS_FROM_LIST( "${KERNEL_SRC}"
"kernel"
"OWkernel"
"WKernel.cpp"
"WBatchLoader.cpp"
"WModule.cpp"
......
......@@ -3,6 +3,6 @@ FILE( GLOB_RECURSE MODULES_SRC "*.cpp" )
# Unit tests
IF( CXXTEST_FOUND )
CXXTEST_ADD_TESTS_FROM_LIST( "${MODULES_SRC}"
"kernel"
"OWkernel"
)
ENDIF( CXXTEST_FOUND )
FILE( GLOB_RECURSE MODULES_SRC "*.cpp" "*.h" )
GET_FILENAME_COMPONENT( MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME )
SET( MODULE_NAME "module_${MODULE_NAME}" ) # prefix all module names with "module_" to separate them from other libs
SET( MODULE_NAME "OWmodule_${MODULE_NAME}" ) # prefix all module names with "OWmodule_" to separate them from other libs
ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} kernel )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${MODULES_SRC}"
"kernel;${MODULE_NAME}"
"OWkernel;${MODULE_NAME}"
)
ENDIF( OW_COMPILE_TESTS )
FILE( GLOB_RECURSE MODULES_SRC "*.cpp" "*.h" )
GET_FILENAME_COMPONENT( MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME )
SET( MODULE_NAME "module_${MODULE_NAME}" ) # prefix all module names with "module_" to separate them from other libs
SET( MODULE_NAME "OWmodule_${MODULE_NAME}" ) # prefix all module names with "OWmodule_" to separate them from other libs
ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} kernel )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${MODULES_SRC}"
"kernel;${MODULE_NAME}"
"OWkernel;${MODULE_NAME}"
)
ENDIF( OW_COMPILE_TESTS )
FILE( GLOB_RECURSE MODULES_SRC "*.cpp" "*.h" )
GET_FILENAME_COMPONENT( MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME )
SET( MODULE_NAME "module_${MODULE_NAME}" ) # prefix all module names with "module_" to separate them from other libs
SET( MODULE_NAME "OWmodule_${MODULE_NAME}" ) # prefix all module names with "OWmodule_" to separate them from other libs
ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} kernel )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${MODULES_SRC}"
"kernel;${MODULE_NAME}"
"OWkernel;${MODULE_NAME}"
)
ENDIF( OW_COMPILE_TESTS )
FILE( GLOB_RECURSE MODULES_SRC "*.cpp" "*.h" )
GET_FILENAME_COMPONENT( MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME )
SET( MODULE_NAME "module_${MODULE_NAME}" ) # prefix all module names with "module_" to separate them from other libs
SET( MODULE_NAME "OWmodule_${MODULE_NAME}" ) # prefix all module names with "OWmodule_" to separate them from other libs
ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} kernel )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${MODULES_SRC}"
"kernel;${MODULE_NAME}"
"OWkernel;${MODULE_NAME}"
)
ENDIF( OW_COMPILE_TESTS )
FILE( GLOB_RECURSE MODULES_SRC "*.cpp" "*.h" )
GET_FILENAME_COMPONENT( MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME )
SET( MODULE_NAME "module_${MODULE_NAME}" ) # prefix all module names with "module_" to separate them from other libs
SET( MODULE_NAME "OWmodule_${MODULE_NAME}" ) # prefix all module names with "OWmodule_" to separate them from other libs
ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} kernel )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${MODULES_SRC}"
"kernel;${MODULE_NAME}"
"OWkernel;${MODULE_NAME}"
)
ENDIF( OW_COMPILE_TESTS )
FILE( GLOB_RECURSE MODULES_SRC "*.cpp" "*.h" )
GET_FILENAME_COMPONENT( MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME )
SET( MODULE_NAME "module_${MODULE_NAME}" ) # prefix all module names with "module_" to separate them from other libs
SET( MODULE_NAME "OWmodule_${MODULE_NAME}" ) # prefix all module names with "OWmodule_" to separate them from other libs
ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} kernel )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${MODULES_SRC}"
"kernel;${MODULE_NAME}"
"OWkernel;${MODULE_NAME}"
)
ENDIF( OW_COMPILE_TESTS )
FILE( GLOB_RECURSE MODULES_SRC "*.cpp" "*.h" )
GET_FILENAME_COMPONENT( MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME )
SET( MODULE_NAME "module_${MODULE_NAME}" ) # prefix all module names with "module_" to separate them from other libs
SET( MODULE_NAME "OWmodule_${MODULE_NAME}" ) # prefix all module names with "OWmodule_" to separate them from other libs
ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} kernel )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${MODULES_SRC}"
"kernel;${MODULE_NAME}"
"OWkernel;${MODULE_NAME}"
)
ENDIF( OW_COMPILE_TESTS )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment