Commit ef823ff8 authored by Ronan Trépos's avatar Ronan Trépos
Browse files

update cmake scripts

parent 8a1b44ea
......@@ -70,7 +70,6 @@ if (COMMAND CMAKE_POLICY)
cmake_policy(SET CMP0020 NEW)#for qt link
endif (COMMAND CMAKE_POLICY)
##
## Check VLE and package dependencies
##
......@@ -97,15 +96,6 @@ if (WITH_GVLE)
endif ()
endif ()
##
## Find boost
##
set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_MULTITHREAD ON)
find_package(Boost COMPONENTS unit_test_framework date_time thread
system filesystem)
##
## Find Qt
##
......@@ -194,12 +184,11 @@ endif ()
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src")
add_subdirectory(src)
endif ()
if (Boost_UNIT_TEST_FRAMEWORK_FOUND AND WITH_TEST)
if (WITH_TEST)
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/test")
add_subdirectory(test)
endif ()
endif (Boost_UNIT_TEST_FRAMEWORK_FOUND AND WITH_TEST)
endif ()
##
## CPack configuration
......
......@@ -37,17 +37,10 @@
#
#=============================================================================
#
# Notes :
# ---------
# FindVLE will try to find VLE and the gtkmm dependencies,
# only some boost libraries are not included into the libraries given
#
#=============================================================================
#
# Usage
# -----
#
# set(VLE_ABI_VERSION 1.2)
# set(VLE_ABI_VERSION 2.0)
# find_package(VLE REQUIRED)
#
#=============================================================================
......@@ -139,9 +132,9 @@ else (${_find_vle_using_cmake})
PKG_CHECK_MODULES(VLE vle-${VLE_ABI_VERSION})
# select only the directory of vle, containing the pkgs directory
# to build VLE_SHARE_DIR
find_path(vle_lib_dir vle-${VLE_ABI_VERSION} PATHS
${VLE_LIBRARY_DIRS} NO_DEFAULT_PATH)
set (VLE_SHARE_DIR "${vle_lib_dir}/../share/vle-${VLE_ABI_VERSION}")
find_path(vle_lib_dir vle PATHS
${VLE_INCLUDE_DIRS} NO_DEFAULT_PATH)
set (VLE_SHARE_DIR "${vle_lib_dir}/../../share/vle-${VLE_ABI_VERSION}")
endif (${_find_vle_using_cmake})
......
......@@ -70,7 +70,6 @@ if (COMMAND CMAKE_POLICY)
cmake_policy(SET CMP0020 NEW)#for qt link
endif (COMMAND CMAKE_POLICY)
##
## Check VLE and package dependencies
##
......@@ -97,15 +96,6 @@ if (WITH_GVLE)
endif ()
endif ()
##
## Find boost
##
set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_MULTITHREAD ON)
find_package(Boost COMPONENTS unit_test_framework date_time thread
system filesystem)
##
## Find Qt
##
......@@ -194,12 +184,11 @@ endif ()
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src")
add_subdirectory(src)
endif ()
if (Boost_UNIT_TEST_FRAMEWORK_FOUND AND WITH_TEST)
if (WITH_TEST)
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/test")
add_subdirectory(test)
endif ()
endif (Boost_UNIT_TEST_FRAMEWORK_FOUND AND WITH_TEST)
endif ()
##
## CPack configuration
......
......@@ -10,4 +10,3 @@ Tags: sunflo
Url: http://www.vle-project.org/2.0
Size: 0
MD5sum: xxxx
......@@ -37,17 +37,10 @@
#
#=============================================================================
#
# Notes :
# ---------
# FindVLE will try to find VLE and the gtkmm dependencies,
# only some boost libraries are not included into the libraries given
#
#=============================================================================
#
# Usage
# -----
#
# set(VLE_ABI_VERSION 1.2)
# set(VLE_ABI_VERSION 2.0)
# find_package(VLE REQUIRED)
#
#=============================================================================
......@@ -139,9 +132,9 @@ else (${_find_vle_using_cmake})
PKG_CHECK_MODULES(VLE vle-${VLE_ABI_VERSION})
# select only the directory of vle, containing the pkgs directory
# to build VLE_SHARE_DIR
find_path(vle_lib_dir vle-${VLE_ABI_VERSION} PATHS
${VLE_LIBRARY_DIRS} NO_DEFAULT_PATH)
set (VLE_SHARE_DIR "${vle_lib_dir}/../share/vle-${VLE_ABI_VERSION}")
find_path(vle_lib_dir vle PATHS
${VLE_INCLUDE_DIRS} NO_DEFAULT_PATH)
set (VLE_SHARE_DIR "${vle_lib_dir}/../../share/vle-${VLE_ABI_VERSION}")
endif (${_find_vle_using_cmake})
......
Supports Markdown
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