Skip to content

Commit

Permalink
Merge pull request #6 from Qix-/options
Browse files Browse the repository at this point in the history
thanks
  • Loading branch information
qknight committed Aug 13, 2016
2 parents 8f2aec0 + c55719b commit 2fb16f6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
11 changes: 9 additions & 2 deletions CMakeLists.txt
Expand Up @@ -4,11 +4,18 @@ cmake_minimum_required(VERSION 3.0)

SET ( LIBNOISE_VERSION "1.0.0-cmake" )

OPTION(BUILD_SHARED_LIBS "Build shared libraries for libnoise" ON)
OPTION(BUILD_LIBNOISE_DOCUMENTATION "Create doxygen documentation for developers" OFF)
OPTION(BUILD_LIBNOISE_UTILS "Build utility functions for use with libnoise" ON)
OPTION(BUILD_LIBNOISE_EXAMPLES "Build libnoise examples" ON)

ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(noiseutils)
ADD_SUBDIRECTORY(examples)
IF (BUILD_LIBNOISE_UTILS)
ADD_SUBDIRECTORY(noiseutils)
ENDIF()
IF (BUILD_LIBNOISE_EXAMPLES)
ADD_SUBDIRECTORY(examples)
ENDIF()
ADD_SUBDIRECTORY(doc)

#ADD_SUBDIRECTORY(samples)
10 changes: 6 additions & 4 deletions src/CMakeLists.txt
Expand Up @@ -44,10 +44,12 @@ set(libSrcs ${libSrcs}
module/voronoi.cpp
)

IF (WIN32)
add_library( noise SHARED ${libSrcs} win32/dllmain.cpp)
ELSE()
add_library( noise SHARED ${libSrcs} )
IF(BUILD_SHARED_LIBS)
IF (WIN32)
add_library( noise SHARED ${libSrcs} win32/dllmain.cpp)
ELSE()
add_library( noise SHARED ${libSrcs} )
ENDIF()
ENDIF()

add_library( noise-static STATIC ${libSrcs} )
Expand Down

0 comments on commit 2fb16f6

Please sign in to comment.