Commit 0462da2c authored by promayon's avatar promayon
Browse files

FIXED (tentative) macro generates strange lib names on windows


git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@2052 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 886ad8be
......@@ -42,6 +42,9 @@ if(EXISTS ${SOFA_BUILD_DIR})
option(SOFA_SUPPORT "Compile SOFA MML Simulator?" ON)
endif()
# reset it
unset(SOFA_LIBS)
# sofa settings
if(SOFA_SUPPORT)
add_definitions(-DSOFA_SUPPORT)
......
......@@ -10,8 +10,12 @@ cmake_minimum_required(VERSION 2.6)
# for generating GUI
option(MML_GENERATE_GUI "Generates MML GUI for CamiTK action" ON)
set(MML_GUI_INCLUDE_DIR ${QT_INCLUDE_DIR})
set(MML_GUI_LIBRARIES ${QT_LIBRARIES})
if(MML_GENERATE_GUI)
find_package(Qt4 REQUIRED)
include(${QT_USE_FILE})
set(MML_GUI_INCLUDE_DIR ${QT_INCLUDE_DIR})
set(MML_GUI_LIBRARIES ${QT_LIBRARIES})
endif()
set(MMLSCHEMA_INCLUDE_DIR ${CAMITK_INCLUDE_DIR}/libraries/mmlschema)
......
......@@ -163,7 +163,7 @@ camitk_library( SHARED
NEEDS_QT_MODULES
NEEDS_XERCESC
NEEDS_LIBXML2
NEEDS_CEP_LIBRARIES mmlschema pml lml
NEEDS_CEP_LIBRARIES mmlschema pml lml
NEEDS_XSD
INCLUDE_DIRECTORIES ${monitoring_INCLUDE_DIRECTORIES}
LINK_DIRECTORIES ${monitoring_LINK_DIRECTORIES}
......
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