Skip to content
Snippets Groups Projects
Commit 8a9cc07e authored by Markus Blatt's avatar Markus Blatt
Browse files

[Merge][CMake] Merged revisions : 6589

Revision  r6589
.----------------------
[CMake]
Create libdunecommon.la in the right directory.

.----------------------


[[Imported from SVN: r7139]]
parents a9aba1e9 d0f02ad2
No related branches found
No related tags found
No related merge requests found
......@@ -19,9 +19,6 @@ set(DUNE_COMMON_VERSION_REVISION "${DUNE_VERSION_REVISION}")
# include dune-common to include pathtest
include_directories("${CMAKE_SOURCE_DIR}")
link_directories("${CMAKE_SOURCE_DIR}")
# set(RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/lib")
# set(ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/lib")
# set(LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/lib")
# set required compiler flags for C++11 (former C++0x)
find_package(CXX11Features)
......@@ -51,7 +48,7 @@ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
add_definitions(-DHAVE_CONFIG_H)
# add subdirectories to execute CMakeLIsts.txt there
# add subdirectories to execute CMakeLists.txt there
add_subdirectory("dune")
# set up CTest
......
......@@ -9,3 +9,4 @@ add_library("dunecommon"
parametertreeparser.cc
path.cc
stdstreams.cc)
set_target_properties(dunecommon PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment